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.313 by root, Sat Jun 24 00:24:09 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
277 delete $self->{visible};
280 delete $self->{root}; 278 delete $self->{root};
281 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->emit ("focus_out");
290
291 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
292} 305}
293 306
294sub hide { 307sub hide {
295 my ($self) = @_; 308 my ($self) = @_;
296 309
… …
298 311
299 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
300 if $self->{parent}; 313 if $self->{parent};
301} 314}
302 315
303sub move { 316sub move_abs {
304 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
305 318
306 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
307 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
308 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
309 322
310 $self->update; 323 $self->update;
311} 324}
312 325
313sub set_size { 326sub set_size {
314 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
315 328
316 $self->{def_w} = $w; 329 $self->{force_w} = $w;
317 $self->{def_h} = $h; 330 $self->{force_h} = $h;
318 331
319 $self->check_size; 332 $self->realloc;
320} 333}
321 334
322sub size_request { 335sub size_request {
323 require Carp; 336 require Carp;
324 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
325} 338}
326 339
340sub baseline_shift {
341 0
342}
343
327sub configure { 344sub configure {
328 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
329 346
330 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
331 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
332 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
333 352
334 # use alignment to adjust x, y 353 # use alignment to adjust x, y
335 354
336 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
337 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
338
339 ($w, $h) = ($w2, $h2);
340 } 357 }
341 358
342 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
343 $self->{x} = $x; 360 $self->{x} = $x;
344 $self->{y} = $y; 361 $self->{y} = $y;
345 $self->update; 362 $self->update;
346 } 363 }
347 364
348 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
349 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
350 }
351}
352 367
353sub size_allocate { 368 $self->{alloc_w} = $w;
354 # nothing to be done 369 $self->{alloc_h} = $h;
355}
356 370
357sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
358 my ($self) = @_; 372 }
359
360 $self->check_size (1);
361 $self->update;
362} 373}
363 374
364sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
365} 381}
366 382
367sub set_max_size { 383sub set_max_size {
368 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
369 385
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
372} 390}
373 391
374sub set_tooltip { 392sub set_tooltip {
375 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
376 394
… …
381 399
382 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
383 401
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 405 }
388} 406}
389 407
390# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
391sub coord2local { 409sub coord2local {
… …
399 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
400 418
401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
402} 420}
403 421
404sub focus_in { 422sub invoke_focus_in {
405 my ($self) = @_; 423 my ($self) = @_;
406 424
407 return if $FOCUS == $self; 425 return if $FOCUS == $self;
408 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
409 427
410 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
411 429
412 $self->_emit (focus_in => $focus);
413
414 $focus->update if $focus; 430 $focus->update if $focus;
415 $FOCUS->update; 431 $FOCUS->update;
416}
417 432
433 0
434}
435
418sub focus_out { 436sub invoke_focus_out {
419 my ($self) = @_; 437 my ($self) = @_;
420 438
421 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
422 440
423 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
424 442
425 $self->_emit (focus_out => $focus);
426
427 $focus->update if $focus; #? 443 $focus->update if $focus; #?
428 444
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 446 unless $FOCUS;
431}
432 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
433sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
434sub button_up { } 458sub invoke_button_up { 1 }
435sub key_down { } 459sub invoke_key_down { 1 }
436sub key_up { } 460sub invoke_key_up { 1 }
437 461
438sub button_down { 462sub invoke_button_down {
439 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
440 464
441 $self->focus_in; 465 $self->grab_focus;
442}
443 466
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{visible};
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
449 535
450sub draw { 536sub draw {
451 my ($self) = @_; 537 my ($self) = @_;
452 538
453 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544
545 # skip widgets that are entirely outside the drawing area
546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
454 548
455 glPushMatrix; 549 glPushMatrix;
456 glTranslate $self->{x}, $self->{y}, 0; 550 glTranslate $self->{x}, $self->{y}, 0;
457 $self->_draw;
458 glPopMatrix;
459 551
460 if ($self == $HOVER && $self->{can_hover}) { 552 if ($self == $HOVER && $self->{can_hover}) {
461 my ($x, $y) = @$self{qw(x y)};
462
463 glColor 1, 0.8, 0.5, 0.2; 553 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
464 glEnable GL_BLEND; 554 glEnable GL_BLEND;
465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 555 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
466 glBegin GL_QUADS; 556 glBegin GL_QUADS;
467 glVertex $x , $y; 557 glVertex 0 , 0;
468 glVertex $x + $self->{w}, $y; 558 glVertex $self->{w}, 0;
469 glVertex $x + $self->{w}, $y + $self->{h}; 559 glVertex $self->{w}, $self->{h};
470 glVertex $x , $y + $self->{h}; 560 glVertex 0 , $self->{h};
471 glEnd; 561 glEnd;
472 glDisable GL_BLEND; 562 glDisable GL_BLEND;
473 } 563 }
474 564
475 if ($ENV{PCLIENT_DEBUG}) { 565 if ($ENV{CFPLUS_DEBUG} & 1) {
476 glPushMatrix; 566 glPushMatrix;
477 glColor 1, 1, 0, 1; 567 glColor 1, 1, 0, 1;
478 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 568 glTranslate 0.375, 0.375;
479 glBegin GL_LINE_LOOP; 569 glBegin GL_LINE_LOOP;
480 glVertex 0 , 0; 570 glVertex 0 , 0;
481 glVertex $self->{w} - 1, 0; 571 glVertex $self->{w} - 1, 0;
482 glVertex $self->{w} - 1, $self->{h} - 1; 572 glVertex $self->{w} - 1, $self->{h} - 1;
483 glVertex 0 , $self->{h} - 1; 573 glVertex 0 , $self->{h} - 1;
484 glEnd; 574 glEnd;
485 glPopMatrix; 575 glPopMatrix;
486 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 576 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
487 } 577 }
578
579 $self->_draw;
580 glPopMatrix;
488} 581}
489 582
490sub _draw { 583sub _draw {
491 my ($self) = @_; 584 my ($self) = @_;
492 585
493 warn "no draw defined for $self\n"; 586 warn "no draw defined for $self\n";
494} 587}
495 588
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}
554
555sub DESTROY { 589sub DESTROY {
556 my ($self) = @_; 590 my ($self) = @_;
557 591
558 delete $WIDGET{$self+0}; 592 delete $WIDGET{$self+0};
559 #$self->deactivate; 593
594 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
560} 596}
561 597
562############################################################################# 598#############################################################################
563 599
564package CFClient::UI::DrawBG; 600package CFClient::UI::DrawBG;
… …
589 625
590 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
591 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
592 628
593 glEnable GL_BLEND; 629 glEnable GL_BLEND;
594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595 glColor @$color; 631 glColor_premultiply @$color;
596 632
597 glBegin GL_QUADS; 633 glBegin GL_QUADS;
598 glVertex 0 , 0; 634 glVertex 0 , 0;
599 glVertex 0 , $h; 635 glVertex 0 , $h;
600 glVertex $w, $h; 636 glVertex $w, $h;
… …
615 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
616 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
617} 653}
618 654
619sub size_request { 655sub size_request {
620 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
621} 659}
622 660
623sub draw { } 661sub draw { }
624 662
625############################################################################# 663#############################################################################
… …
629our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
630 668
631sub new { 669sub new {
632 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
633 671
634 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
635 673
636 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
637 children => [], 675 children => [],
638 can_events => 0, 676 can_events => 0,
639 %arg, 677 %arg,
640 ); 678 );
679
641 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
642 682
643 $self 683 $self
644} 684}
645 685
646sub add { 686sub add {
… …
654 $self->{children} = [ 694 $self->{children} = [
655 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
656 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
657 ]; 697 ];
658 698
659 $self->check_size (1); 699 $self->realloc;
660 $self->update;
661} 700}
662 701
663sub children { 702sub children {
664 @{ $_[0]{children} } 703 @{ $_[0]{children} }
665} 704}
… …
670 delete $child->{parent}; 709 delete $child->{parent};
671 $child->hide; 710 $child->hide;
672 711
673 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
674 713
675 $self->check_size (1); 714 $self->realloc;
676 $self->update;
677} 715}
678 716
679sub clear { 717sub clear {
680 my ($self) = @_; 718 my ($self) = @_;
681 719
… …
685 for (@$children) { 723 for (@$children) {
686 delete $_->{parent}; 724 delete $_->{parent};
687 $_->hide; 725 $_->hide;
688 } 726 }
689 727
690 $self->check_size; 728 $self->realloc;
691 $self->update;
692} 729}
693 730
694sub find_widget { 731sub find_widget {
695 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
696 733
697 $x -= $self->{x}; 734 $x -= $self->{x};
698 $y -= $self->{y}; 735 $y -= $self->{y};
699 736
700 my $res; 737 my $res;
701 738
702 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
703 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
704 and return $res; 741 and return $res;
705 } 742 }
706 743
707 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
728} 765}
729 766
730sub add { 767sub add {
731 my ($self, $child) = @_; 768 my ($self, $child) = @_;
732 769
733 $self->{children} = []; 770 $self->SUPER::remove ($_) for @{ $self->{children} };
734
735 $self->SUPER::add ($child); 771 $self->SUPER::add ($child);
736} 772}
737 773
738sub remove { 774sub remove {
739 my ($self, $widget) = @_; 775 my ($self, $widget) = @_;
… …
748 784
749sub size_request { 785sub size_request {
750 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
751} 787}
752 788
753sub size_allocate { 789sub invoke_size_allocate {
754 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
755 791
756 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
757} 795}
758 796
759############################################################################# 797#############################################################################
798
799# back-buffered drawing area
760 800
761package CFClient::UI::Window; 801package CFClient::UI::Window;
762 802
763our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
764 804
… …
775 815
776 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
777 $self->SUPER::update; 817 $self->SUPER::update;
778} 818}
779 819
780sub size_allocate { 820sub invoke_size_allocate {
781 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
782 822
783 $self->SUPER::size_allocate ($w, $h);
784 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
785} 826}
786 827
787sub _render { 828sub _render {
829 my ($self) = @_;
830
788 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
789} 832}
790 833
791sub render_child { 834sub render_child {
792 my ($self) = @_; 835 my ($self) = @_;
793 836
794 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
795 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
796 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
797 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
798 $self->_render; 848 $self->_render;
799 }; 849 };
800} 850}
801 851
802sub _draw { 852sub _draw {
803 my ($self) = @_; 853 my ($self) = @_;
804 854
805 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
806 856
807 my $tex = $self->{texture} 857 my $tex = $self->{texture}
808 or return; 858 or return;
809 859
810 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
812 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
813 863
814 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
815 865
816 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
817} 867}
… …
833} 883}
834 884
835sub size_request { 885sub size_request {
836 my ($self) = @_; 886 my ($self) = @_;
837 887
838 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
839 889
840 $w = 10 if $self->{scroll_x}; 890 $w = 10 if $self->{scroll_x};
841 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
842 892
843 ($w, $h) 893 ($w, $h)
844} 894}
845 895
846sub size_allocate { 896sub invoke_size_allocate {
847 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
848 898
899 my $child = $self->child;
900
849 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
850 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
851 903
852 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
853 $self->update; 905 $self->update;
906
907 1
854} 908}
855 909
856sub set_offset { 910sub set_offset {
857 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
858 912
… …
891} 945}
892 946
893sub _render { 947sub _render {
894 my ($self) = @_; 948 my ($self) = @_;
895 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
896 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
897 954
898 $self->SUPER::_render; 955 $self->SUPER::_render;
899} 956}
900 957
… …
903package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
904 961
905our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
906 963
907sub new { 964sub new {
908 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
909 968
910 my $self; 969 my $self;
911 970
912 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
913 vertical => 1, 972 vertical => 1,
… …
918 ; 977 ;
919 978
920 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
921 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
922 slider => $slider, 981 slider => $slider,
923 @_, 982 %arg,
924 ); 983 );
925 984
926 $self->{vp}->add ($self->{scrolled});
927 $self->add ($self->{vp});
928 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
929 987
930 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
931} 995}
932 996
933sub update { 997sub update {
934 my ($self) = @_; 998 my ($self) = @_;
935 999
… …
938 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
939 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
940 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
941} 1005}
942 1006
943sub size_allocate { 1007sub invoke_size_allocate {
944 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
945
946 $self->SUPER::size_allocate ($w, $h);
947 1009
948 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
949 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
950} 1014}
951 1015
952#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
953# update viewport offset on scroll 1017# update viewport offset on scroll
954 1018
… …
974 1038
975 if ($self->{bg}) { 1039 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
977 1041
978 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
981 1045
982 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
983 glVertex 0 , 0; 1047 glVertex 0 , 0;
984 glVertex 0 , $h; 1048 glVertex 0 , $h;
985 glVertex $w, $h; 1049 glVertex $w, $h;
… …
998 1062
999our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1000 1064
1001use CFClient::OpenGL; 1065use CFClient::OpenGL;
1002 1066
1003my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1004 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 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); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1006 1074
1007sub new { 1075sub new {
1008 my $class = shift; 1076 my ($class, %arg) = @_;
1009 1077
1010 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1081 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1082 can_events => 1,
1016 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1017 ); 1086 );
1018 1087
1019 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1020 align => 0, 1089 align => 0,
1021 valign => 1, 1090 valign => 1,
1022 text => $self->{title}, 1091 text => $self->{title},
1023 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1024 1103
1025 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1026} 1113}
1027 1114
1028sub border { 1115sub border {
1029 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1030} 1117}
1031 1118
1032sub size_request { 1119sub size_request {
1033 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1034 1127
1035 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1036 1129
1037 ( 1130 (
1038 $w + $self->border * 2, 1131 $w + $self->border * 2,
1039 $h + $self->border * 2, 1132 $h + $self->border * 2,
1040 ) 1133 )
1041} 1134}
1042 1135
1043sub size_allocate { 1136sub invoke_size_allocate {
1044 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1045 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1046 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1048 1149
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); 1150 $self->child->configure ($border, $border, $w, $h);
1053}
1054 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1055sub button_down { 1158sub invoke_button_down {
1056 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1057 1160
1058 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1059 my $border = $self->border; 1162 my $border = $self->border;
1060 1163
… …
1073 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1074 1177
1075 my $dx = $ev->{x} - $ox; 1178 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1179 my $dy = $ev->{y} - $oy;
1077 1180
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1181 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1182 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1183
1083 $self->check_size; 1184 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1185 $self->realloc;
1084 }; 1186 };
1085 1187
1086 } elsif ($lr ^ $td) { 1188 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1189 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1190 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1192 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1193 my ($ev, $x, $y) = @_;
1092 1194
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1196
1095 $self->{user_x} = $bx + $x - $ox; 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1198 # HACK: the next line is required to enforce placement
1097 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1200 };
1201 } else {
1202 return 0;
1203 }
1204
1101 } 1205 1
1102} 1206}
1103 1207
1104sub button_up { 1208sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1106 1210
1107 delete $self->{motion}; 1211 ! ! delete $self->{motion}
1108} 1212}
1109 1213
1110sub mouse_motion { 1214sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1112 1216
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1218
1219 ! ! $self->{motion}
1114} 1220}
1115 1221
1116sub _draw { 1222sub _draw {
1117 my ($self) = @_; 1223 my ($self) = @_;
1118 1224
1225 my $child = $self->{children}[0];
1226
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1227 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1228 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1229
1122 glEnable GL_TEXTURE_2D; 1230 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1231 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1232
1125 my $border = $self->border; 1233 my $border = $self->border;
1126 1234
1127 glColor @{ $self->{border_bg} }; 1235 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1236 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1237 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1238 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1239 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1240
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1241 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1242 glColor @{ $self->{bg} };
1135 1243
1136 # TODO: repeat texture not scale 1244 # TODO: repeat texture not scale
1245 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1246 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1247 $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); 1248 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1249 }
1147 1250
1148 glDisable GL_TEXTURE_2D; 1251 glDisable GL_TEXTURE_2D;
1149 1252
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1253 $child->draw;
1254
1255 if ($self->{title_widget}) {
1256 glTranslate 0, $border - $self->{h};
1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1153} 1264}
1154 1265
1155############################################################################# 1266#############################################################################
1156 1267
1157package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1290 my ($self, $x, $y, $child) = @_;
1180 1291
1181 $child->set_parent ($self); 1292 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1293 $self->{children}[$y][$x] = $child;
1183 1294
1184 $self->check_size (1); 1295 $self->realloc;
1296}
1297
1298sub remove {
1299 my ($self, $child) = @_;
1300
1301 # TODO: not yet implemented
1185} 1302}
1186 1303
1187# TODO: move to container class maybe? send children a signal on removal? 1304# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1305sub clear {
1189 my ($self) = @_; 1306 my ($self) = @_;
… …
1194 for (@children) { 1311 for (@children) {
1195 delete $_->{parent}; 1312 delete $_->{parent};
1196 $_->hide; 1313 $_->hide;
1197 } 1314 }
1198 1315
1199 $self->check_size (1); 1316 $self->realloc;
1200 $self->update;
1201} 1317}
1202 1318
1203sub get_wh { 1319sub get_wh {
1204 my ($self) = @_; 1320 my ($self) = @_;
1205 1321
… …
1231 (sum @$ws), 1347 (sum @$ws),
1232 (sum @$hs), 1348 (sum @$hs),
1233 ) 1349 )
1234} 1350}
1235 1351
1236sub size_allocate { 1352sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1238 1354
1239 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1240 1356
1241 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1273 } 1389 }
1274 1390
1275 $y += $row_h; 1391 $y += $row_h;
1276 } 1392 }
1277 1393
1394 1
1278} 1395}
1279 1396
1280sub find_widget { 1397sub find_widget {
1281 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1282 1399
… …
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 ) 1438 )
1322} 1439}
1323 1440
1324sub size_allocate { 1441sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1326 1443
1327 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1328 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1329 1446
1330 my @req; 1447 my @req;
1331 1448
1332 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1333 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1334 } else { 1451 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1336 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1337 1454
1338 if ($req > $space) { 1455 if ($req > $space) {
1339 # ah well, not enough space 1456 # ah well, not enough space
1340 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1341 } else { 1458 } else {
1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1343 1460
1344 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1345 1462
1346 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1347 for 0 .. $#$children; 1464 for 0 .. $#children;
1348 } 1465 }
1349 } 1466 }
1350 1467
1351 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1352 1469
1353 my $pos = 0; 1470 my $pos = 0;
1354 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1355 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1474
1358 $pos += $alloc; 1475 $pos += $alloc;
1359 } 1476 }
1360 1477
1361 1 1478 1
… …
1413 ellipsise => 3, # end 1530 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1415 fontsize => 1, 1532 fontsize => 1,
1416 align => -1, 1533 align => -1,
1417 valign => -1, 1534 valign => -1,
1418 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1419 can_events => 0, 1537 can_events => 0,
1420 %arg 1538 %arg
1421 ); 1539 );
1422 1540
1423 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1450 1568
1451 delete $self->{texture}; 1569 delete $self->{texture};
1452 $self->SUPER::update; 1570 $self->SUPER::update;
1453} 1571}
1454 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1455sub set_text { 1580sub set_text {
1456 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1457 1582
1458 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1460 1585
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1463 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1464 $self->update; 1591 $self->update;
1465 $self->check_size;
1466} 1592}
1467 1593
1468sub set_markup { 1594sub set_markup {
1469 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1470 1596
… …
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1601
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1478 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1479 $self->update; 1607 $self->update;
1480 $self->check_size;
1481} 1608}
1482 1609
1483sub size_request { 1610sub size_request {
1484 my ($self) = @_; 1611 my ($self) = @_;
1485 1612
1613 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1619
1492 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1493 1621
1494 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1625
1498 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1499 1627
1500 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1502 } 1633 };
1503 1634
1504 ( 1635 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1636}
1509 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1510sub size_allocate { 1642sub invoke_size_allocate {
1511 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1512 1644
1645 delete $self->{ox};
1646
1513 delete $self->{texture}; 1647 delete $self->{texture}
1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1514} 1651}
1515 1652
1516sub set_fontsize { 1653sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1518 1655
1519 $self->{fontsize} = $fontsize; 1656 $self->{fontsize} = $fontsize;
1520 delete $self->{texture}; 1657 delete $self->{texture};
1521 1658
1522 $self->update; 1659 $self->realloc;
1523 $self->check_size; 1660}
1661
1662sub reconfigure {
1663 my ($self) = @_;
1664
1665 delete $self->{size_req};
1666
1667 $self->SUPER::reconfigure;
1524} 1668}
1525 1669
1526sub _draw { 1670sub _draw {
1527 my ($self) = @_; 1671 my ($self) = @_;
1528 1672
… …
1534 $self->{layout}->set_width ($self->{w}); 1678 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1679 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1680 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1681 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1682
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1683 new_from_layout CFClient::Texture $self->{layout}
1684 };
1540 1685
1686 unless (exists $self->{ox}) {
1541 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1687 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1542 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1688 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1543 : ($self->{w} - $tex->{w}) * 0.5); 1689 : ($self->{w} - $tex->{w}) * 0.5);
1544 1690
1545 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1691 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1546 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1692 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1547 : ($self->{h} - $tex->{h}) * 0.5); 1693 : ($self->{h} - $tex->{h}) * 0.5);
1548
1549 $tex
1550 }; 1694 };
1551 1695
1552 glEnable GL_TEXTURE_2D; 1696 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1697
1698 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1699 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1554 1700
1555 if ($tex->{format} == GL_ALPHA) { 1701 if ($tex->{format} == GL_ALPHA) {
1702 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1556 glColor @{$self->{fg}}; 1703 glColor @{$self->{fg}};
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1704 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1558 } else { 1705 } else {
1706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1707 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1560 } 1708 }
1561 1709
1562 glDisable GL_TEXTURE_2D; 1710 glDisable GL_TEXTURE_2D;
1563} 1711}
1564 1712
… …
1581 can_hover => 1, 1729 can_hover => 1,
1582 can_focus => 1, 1730 can_focus => 1,
1583 valign => 0, 1731 valign => 0,
1584 can_events => 1, 1732 can_events => 1,
1585 #text => ... 1733 #text => ...
1734 #hidden => "*",
1586 @_ 1735 @_
1587 ) 1736 )
1588} 1737}
1589 1738
1590sub _set_text { 1739sub _set_text {
… …
1592 1741
1593 delete $self->{cur_h}; 1742 delete $self->{cur_h};
1594 1743
1595 return if $self->{text} eq $text; 1744 return if $self->{text} eq $text;
1596 1745
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1746 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1747 $self->{text} = $text;
1601 1748
1602 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1751 delete $self->{size_req};
1604 1752
1605 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1754
1755 $self->realloc;
1756 $self->update;
1606} 1757}
1607 1758
1608sub set_text { 1759sub set_text {
1609 my ($self, $text) = @_; 1760 my ($self, $text) = @_;
1610 1761
1611 $self->{cursor} = length $text; 1762 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1763 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1764}
1616 1765
1617sub get_text { 1766sub get_text {
1618 $_[0]{text} 1767 $_[0]{text}
1619} 1768}
… …
1624 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1625 1774
1626 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1627} 1776}
1628 1777
1629sub key_down { 1778sub invoke_key_down {
1630 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1631 1780
1632 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1633 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1634 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1646 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1647 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1648 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1649 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 1800 $self->emit ('escape');
1652 } elsif ($uni) { 1801 } elsif ($uni) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1803 } else {
1804 return 0;
1654 } 1805 }
1655 1806
1656 $self->_set_text ($text); 1807 $self->_set_text ($text);
1657 $self->update;
1658 $self->check_size;
1659}
1660 1808
1809 $self->realloc;
1810
1811 1
1812}
1813
1661sub focus_in { 1814sub invoke_focus_in {
1662 my ($self) = @_; 1815 my ($self) = @_;
1663 1816
1664 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1665 1818
1666 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1667} 1820}
1668 1821
1669sub button_down { 1822sub invoke_button_down {
1670 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1671 1824
1672 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1673 1826
1674 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1675 1828
1676 # byte-index to char-index 1829 # byte-index to char-index
1677 my $text = $self->{text}; 1830 my $text = $self->{text};
1678 utf8::encode $text; 1831 utf8::encode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 1832 $self->{cursor} = length substr $text, 0, $idx;
1680 1833
1681 $self->_set_text ($self->{text}); 1834 $self->_set_text ($self->{text});
1682 $self->update; 1835 $self->update;
1836
1837 1
1683} 1838}
1684 1839
1685sub mouse_motion { 1840sub invoke_mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1843
1844 1
1688} 1845}
1689 1846
1690sub _draw { 1847sub _draw {
1691 my ($self) = @_; 1848 my ($self) = @_;
1692 1849
1693 local $self->{fg} = $self->{fg}; 1850 local $self->{fg} = $self->{fg};
1694 1851
1695 if ($FOCUS == $self) { 1852 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 1853 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 1854 $self->{fg} = $self->{active_fg};
1698 } else { 1855 } else {
1699 glColor @{$self->{bg}}; 1856 glColor_premultiply @{$self->{bg}};
1700 } 1857 }
1701 1858
1702 glEnable GL_BLEND; 1859 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1860 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 1861 glBegin GL_QUADS;
1705 glVertex 0 , 0; 1862 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 1863 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 1864 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 1865 glVertex $self->{w}, 0;
… …
1733 1890
1734our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1735 1892
1736use CFClient::OpenGL; 1893use CFClient::OpenGL;
1737 1894
1738sub key_down { 1895sub invoke_key_down {
1739 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1740 1897
1741 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1742 1899
1743 if ($sym == 13) { 1900 if ($sym == 13) {
1744 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1745 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1746 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1747 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1748 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1749 $self->update; 1907 $self->update;
1750 1908
1751 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1752 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1753 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1769 } else { 1927 } else {
1770 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1771 } 1929 }
1772 1930
1773 } else { 1931 } else {
1774 $self->SUPER::key_down ($ev); 1932 return $self->SUPER::invoke_key_down ($ev)
1933 }
1934
1775 } 1935 1
1776
1777} 1936}
1778 1937
1779############################################################################# 1938#############################################################################
1780 1939
1781package CFClient::UI::Button; 1940package CFClient::UI::Button;
… …
1790 1949
1791sub new { 1950sub new {
1792 my $class = shift; 1951 my $class = shift;
1793 1952
1794 $class->SUPER::new ( 1953 $class->SUPER::new (
1795 padding => 4, 1954 padding_x => 4,
1955 padding_y => 4,
1796 fg => [1, 1, 1], 1956 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 1957 active_fg => [0, 0, 1],
1798 can_hover => 1, 1958 can_hover => 1,
1799 align => 0, 1959 align => 0,
1800 valign => 0, 1960 valign => 0,
1801 can_events => 1, 1961 can_events => 1,
1802 @_ 1962 @_
1803 ) 1963 )
1804} 1964}
1805 1965
1806sub activate { }
1807
1808sub button_up { 1966sub invoke_button_up {
1809 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1810 1968
1811 $self->emit ("activate") 1969 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
1972
1973 1
1814} 1974}
1815 1975
1816sub _draw { 1976sub _draw {
1817 my ($self) = @_; 1977 my ($self) = @_;
1818 1978
1819 local $self->{fg} = $self->{fg}; 1979 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 1980
1825 glEnable GL_TEXTURE_2D; 1981 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 1983 glColor 0, 0, 0, 1;
1828 1984
… …
1833 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1834} 1990}
1835 1991
1836############################################################################# 1992#############################################################################
1837 1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
2026}
2027
2028#############################################################################
2029
1838package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
1839 2031
1840our @ISA = CFClient::UI::DrawBG::; 2032our @ISA = CFClient::UI::DrawBG::;
1841 2033
1842my @tex = 2034my @tex =
… …
1847 2039
1848sub new { 2040sub new {
1849 my $class = shift; 2041 my $class = shift;
1850 2042
1851 $class->SUPER::new ( 2043 $class->SUPER::new (
1852 padding => 2, 2044 padding_x => 2,
2045 padding_y => 2,
1853 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 2047 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 2048 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 2049 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 2050 state => 0,
… …
1861} 2054}
1862 2055
1863sub size_request { 2056sub size_request {
1864 my ($self) = @_; 2057 my ($self) = @_;
1865 2058
1866 ($self->{padding} * 2 + 6) x 2 2059 (6) x 2
1867} 2060}
1868 2061
1869sub button_down { 2062sub invoke_button_down {
1870 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1871 2064
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
1875 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2069 } else {
2070 return 0
2071 }
2072
1876 } 2073 1
1877} 2074}
1878 2075
1879sub _draw { 2076sub _draw {
1880 my ($self) = @_; 2077 my ($self) = @_;
1881 2078
1882 $self->SUPER::_draw; 2079 $self->SUPER::_draw;
1883 2080
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2081 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2082
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2083 my ($w, $h) = @$self{qw(w h)};
2084
2085 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2086
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2087 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2088
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2089 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2090
… …
1899package CFClient::UI::Image; 2098package CFClient::UI::Image;
1900 2099
1901our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
1902 2101
1903use CFClient::OpenGL; 2102use CFClient::OpenGL;
1904use Carp qw/confess/;
1905 2103
1906our %loaded_images; 2104our %texture_cache;
1907 2105
1908sub new { 2106sub new {
1909 my $class = shift; 2107 my $class = shift;
1910 2108
1911 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
1912 2113
1913 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
1914 2116
1915 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
1916 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1917 2119
1918 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
1919 2121
1920 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1921
1922 $self->{aspect} = $tex->{w} / $tex->{h};
1923 2123
1924 $self 2124 $self
1925} 2125}
1926 2126
1927sub size_request { 2127sub size_request {
1928 my ($self) = @_; 2128 my ($self) = @_;
1929 2129
1930 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
1931} 2131}
1932 2132
1933sub _draw { 2133sub _draw {
1934 my ($self) = @_; 2134 my ($self) = @_;
1935 2135
… …
2046 2246
2047 my $h1 = $self->{h} * (1 - $ycut1); 2247 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2248 my $h2 = $self->{h} * (1 - $ycut2);
2049 2249
2050 glEnable GL_BLEND; 2250 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2251 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2252 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2253 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2254 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2255
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2256 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2257 glBegin GL_QUADS;
… …
2156 fg => [1, 1, 1], 2357 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2358 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2359 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2360 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2361 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2362 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2363 min_h => $::WIDTH / 80,
2163 vertical => 0, 2364 vertical => 0,
2164 can_hover => 1, 2365 can_hover => 1,
2165 inner_pad => 0.02, 2366 inner_pad => 0.02,
2166 @_ 2367 @_
2167 ); 2368 );
… …
2175sub set_range { 2376sub set_range {
2176 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2177 2378
2178 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2179 2380
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2381 if ("@$range" ne "@{$self->{range}}") {
2382 $self->update;
2383 $self->set_value ($self->{range}[0]);
2384 }
2182} 2385}
2183 2386
2184sub set_value { 2387sub set_value {
2185 my ($self, $value) = @_; 2388 my ($self, $value) = @_;
2186 2389
… …
2197 if $unit; 2400 if $unit;
2198 2401
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200 2403
2201 if ($value != $old_value) { 2404 if ($value != $old_value) {
2202 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2203 $self->update; 2406 $self->update;
2204 } 2407 }
2205} 2408}
2206 2409
2207sub size_request { 2410sub size_request {
2208 my ($self) = @_; 2411 my ($self) = @_;
2209 2412
2210 my $w = $self->{req_w}; 2413 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2414}
2215 2415
2216sub button_down { 2416sub invoke_button_down {
2217 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2218 2418
2219 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2220 2420
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2422
2223 $self->mouse_motion ($ev, $x, $y); 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2224} 2424}
2225 2425
2226sub mouse_motion { 2426sub invoke_mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2228 2428
2229 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231 2431
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2432 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2433
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2434 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2435
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2436 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2437 } else {
2438 return 0;
2439 }
2440
2237 } 2441 1
2238} 2442}
2239 2443
2240sub update { 2444sub update {
2241 my ($self) = @_; 2445 my ($self) = @_;
2242 2446
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2447 delete $self->{knob_w};
2448 $self->SUPER::update;
2449}
2450
2451sub _draw {
2452 my ($self) = @_;
2453
2454 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2455 $self->set_value ($self->{range}[0]);
2245 2456
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2457 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2458 my $range = ($hi - $page - $lo) || 1e-100;
2248 2459
… …
2254 $value = ($value - $lo) / $range; 2465 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2466 $value = $value * $self->{scale} + $self->{offset};
2256 2467
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2468 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2469 $self->{knob_w} = $knob_w;
2259 }); 2470 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2471
2267 $self->SUPER::_draw (); 2472 $self->SUPER::_draw ();
2268 2473
2269 glScale $self->{w}, $self->{h}; 2474 glScale $self->{w}, $self->{h};
2270 2475
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2536sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2537sub set_value { shift->{slider}->set_value (@_) }
2333 2538
2334############################################################################# 2539#############################################################################
2335 2540
2336package CFClient::UI::TextView; 2541package CFClient::UI::TextScroller;
2337 2542
2338our @ISA = CFClient::UI::HBox::; 2543our @ISA = CFClient::UI::HBox::;
2339 2544
2340use CFClient::OpenGL; 2545use CFClient::OpenGL;
2341 2546
… …
2343 my $class = shift; 2548 my $class = shift;
2344 2549
2345 my $self = $class->SUPER::new ( 2550 my $self = $class->SUPER::new (
2346 fontsize => 1, 2551 fontsize => 1,
2347 can_events => 0, 2552 can_events => 0,
2553 indent => 0,
2348 #font => default_font 2554 #font => default_font
2349 @_, 2555 @_,
2350 2556
2351 layout => (new CFClient::Layout 1), 2557 layout => (new CFClient::Layout 1),
2352 par => [], 2558 par => [],
… …
2367 2573
2368 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2369 $self->reflow; 2575 $self->reflow;
2370} 2576}
2371 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2372sub size_allocate { 2587sub invoke_size_allocate {
2373 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2374 2589
2375 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2376 2592
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 2597
2381 $self->reflow; 2598 $self->reflow;
2382}
2383 2599
2384sub text_size { 2600 local $self->{children} = [$empty, $slider];
2385 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2386 2606
2387 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2388 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2392 2620 );
2621
2393 $layout->size 2622 $layout
2394} 2623}
2395 2624
2396sub reflow { 2625sub reflow {
2397 my ($self) = @_; 2626 my ($self) = @_;
2398 2627
… …
2407 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2408} 2637}
2409 2638
2410sub clear { 2639sub clear {
2411 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2412 2644
2413 $self->{par} = []; 2645 $self->{par} = [];
2414 $self->{height} = 0; 2646 $self->{height} = 0;
2415 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2416} 2648}
2417 2649
2418sub add_paragraph { 2650sub add_paragraph {
2419 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2420 2652
2421 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2422 my ($w, $h) = $self->text_size ($line); 2654
2423 $self->{height} += $h; 2655 $para = {
2424 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2425 } 2662 };
2426 2663
2427 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2428} 2676}
2429 2677
2430sub update { 2678sub update {
2431 my ($self) = @_; 2679 my ($self) = @_;
2432 2680
… …
2434 2682
2435 return unless $self->{h} > 0; 2683 return unless $self->{h} > 0;
2436 2684
2437 delete $self->{texture}; 2685 delete $self->{texture};
2438 2686
2439 $ROOT->on_post_alloc ($self, sub { 2687 $ROOT->on_post_alloc ($self => sub {
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 2689
2442 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2443 my $height = 0; 2691 my $height = 0;
2444 2692
2445 my $layout = $self->{layout};
2446
2447 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2448
2449 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2450 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2451 $layout->set_width ($W - $_->[3]); 2695 my $layout = $self->get_layout ($para);
2452 $layout->set_markup ($_->[4]);
2453 my ($w, $h) = $layout->size; 2696 my ($w, $h) = $layout->size;
2454 $_->[0] = $w + $_->[3]; 2697
2455 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2456 } 2701 }
2457 2702
2458 $height += $_->[1]; 2703 $height += $para->{h};
2459 } 2704 }
2460 2705
2461 $self->{height} = $height; 2706 $self->{height} = $height;
2462 2707
2463 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2464 2709
2465 delete $self->{texture}; 2710 delete $self->{texture};
2466 } 2711 }
2467 2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2715 }
2716
2468 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 2718 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
2471 2720
2472 my $top = int $self->{children}[1]{range}[0]; 2721 my $top = int $self->{children}[1]{range}[0];
2473 2722
2474 my $y0 = $top; 2723 my $y0 = $top;
2475 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2476 2725
2477 my $y = 0; 2726 my $y = 0;
2478
2479 my $layout = $self->{layout};
2480
2481 $layout->set_font ($self->{font}) if $self->{font};
2482 2727
2483 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2484 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2485 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2486 2731
2487 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2488 my $h = $par->[1]; 2733 my $h = $para->{h};
2489 2734
2490 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 2736
2492 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2493 $layout->set_markup ($par->[4]);
2494 2738
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2496 2740
2497 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2498 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 glDisable GL_BLEND;
2748 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, ();
2750
2751 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0;
2753
2754 $_->draw;
2755 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 }
2499 } 2759 }
2500 2760
2501 $y += $h; 2761 $y += $h;
2502 } 2762 }
2503 2763
2504 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2505 }; 2765 };
2506 }); 2766 });
2507} 2767}
2508 2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2776}
2777
2509sub _draw { 2778sub _draw {
2510 my ($self) = @_; 2779 my ($self) = @_;
2511 2780
2512 glEnable GL_TEXTURE_2D; 2781 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 2783 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2517 2786
2518 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2519
2520} 2788}
2521 2789
2522############################################################################# 2790#############################################################################
2523 2791
2524package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2603} 2871}
2604 2872
2605sub set_tooltip_from { 2873sub set_tooltip_from {
2606 my ($self, $widget) = @_; 2874 my ($self, $widget) = @_;
2607 2875
2876 my $tooltip = $widget->{tooltip};
2877
2878 if ($ENV{CFPLUS_DEBUG} & 2) {
2879 $tooltip .= "\n\n" . (ref $widget) . "\n"
2880 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2881 . "req $widget->{req_w} $widget->{req_h}\n"
2882 . "visible $widget->{visible}";
2883 }
2884
2885 $tooltip =~ s/^\n+//;
2886 $tooltip =~ s/\n+$//;
2887
2608 $self->add (new CFClient::UI::Label 2888 $self->add (new CFClient::UI::Label
2609 markup => $widget->{tooltip}, 2889 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2890 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 2891 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 2892 fg => [0, 0, 0, 1],
2613 ellipsise => 0, 2893 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 2894 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2622 2902
2623 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2624} 2904}
2625 2905
2626sub size_allocate { 2906sub invoke_size_allocate {
2627 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2628 2908
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2910}
2911
2912sub invoke_visibility_change {
2913 my ($self, $visible) = @_;
2914
2915 return unless $visible;
2916
2917 $self->{root}->on_post_alloc ("move_$self" => sub {
2918 my $widget = $self->{owner}
2919 or return;
2920
2921 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2922
2923 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2924 if $x + $self->{w} > $self->{root}{w};
2925
2926 $self->move_abs ($x, $y);
2927 });
2630} 2928}
2631 2929
2632sub _draw { 2930sub _draw {
2633 my ($self) = @_; 2931 my ($self) = @_;
2634 2932
… …
2651 glVertex $w, $h; 2949 glVertex $w, $h;
2652 glVertex $w, 0; 2950 glVertex $w, 0;
2653 glEnd; 2951 glEnd;
2654 2952
2655 glTranslate 2 - 0.375, 2 - 0.375; 2953 glTranslate 2 - 0.375, 2 - 0.375;
2954
2656 $self->SUPER::_draw; 2955 $self->SUPER::_draw;
2657} 2956}
2658 2957
2659############################################################################# 2958#############################################################################
2660 2959
… …
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3018 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2720 3019
2721 if ($tex) { 3020 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 3021 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3022 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 3023 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3024 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 3025 glDisable GL_TEXTURE_2D;
2727 } 3026 }
2728} 3027}
2729 3028
2730sub DESTROY { 3029sub destroy {
2731 my ($self) = @_; 3030 my ($self) = @_;
2732 3031
2733 $self->{timer}->cancel 3032 $self->{timer}->cancel
2734 if $self->{timer}; 3033 if $self->{timer};
2735 3034
2736 $self->SUPER::DESTROY; 3035 $self->SUPER::destroy;
2737} 3036}
2738 3037
2739############################################################################# 3038#############################################################################
2740 3039
2741package CFClient::UI::Inventory; 3040package CFClient::UI::Buttonbar;
2742 3041
2743our @ISA = CFClient::UI::ScrolledWindow::; 3042our @ISA = CFClient::UI::HBox::;
2744 3043
2745sub new { 3044# 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 3045
2781############################################################################# 3046#############################################################################
2782 3047
2783package CFClient::UI::Menu; 3048package CFClient::UI::Menu;
2784 3049
… …
2796 ); 3061 );
2797 3062
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3063 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2799 3064
2800 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2802 3067
2803 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2804 if (!ref $widget) { 3069 if (!ref $widget) {
2805 $widget = new CFClient::UI::Label 3070 $widget = new CFClient::UI::Label
2806 can_hover => 1, 3071 can_hover => 1,
2807 can_events => 1, 3072 can_events => 1,
2808 text => $widget; 3073 markup => $widget,
3074 tooltip => $tooltip
2809 } 3075 }
2810 3076
2811 $self->{item}{$widget} = $item; 3077 $self->{item}{$widget} = $item;
2812 3078
2813 $self->{vbox}->add ($widget); 3079 $self->{vbox}->add ($widget);
… …
2818 3084
2819# popup given the event (must be a mouse button down event currently) 3085# popup given the event (must be a mouse button down event currently)
2820sub popup { 3086sub popup {
2821 my ($self, $ev) = @_; 3087 my ($self, $ev) = @_;
2822 3088
2823 $self->_emit ("popdown"); 3089 $self->emit ("popdown");
2824 3090
2825 # maybe save $GRAB? must be careful about events... 3091 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 3092 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 3093 $self->{button} = $ev->{button};
2828 3094
2829 $self->show; 3095 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3096 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 3097}
2832 3098
2833sub mouse_motion { 3099sub invoke_mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 3100 my ($self, $ev, $x, $y) = @_;
2835 3101
2836 # TODO: should use vbox->find_widget or so 3102 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3103 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 3104 $self->{hover} = $self->{item}{$HOVER};
2839}
2840 3105
3106 0
3107}
3108
2841sub button_up { 3109sub invoke_button_up {
2842 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2843 3111
2844 if ($ev->{button} == $self->{button}) { 3112 if ($ev->{button} == $self->{button}) {
2845 undef $GRAB; 3113 undef $GRAB;
2846 $self->hide; 3114 $self->hide;
2847 3115
2848 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 3117 $self->{hover}[1]->() if $self->{hover};
3118 } else {
3119 return 0
3120 }
3121
2850 } 3122 1
2851} 3123}
2852 3124
2853############################################################################# 3125#############################################################################
2854 3126
2855package CFClient::UI::Statusbox; 3127package CFClient::UI::Multiplexer;
2856 3128
2857our @ISA = CFClient::UI::VBox::; 3129our @ISA = CFClient::UI::Container::;
2858 3130
2859sub new { 3131sub new {
2860 my $class = shift; 3132 my $class = shift;
2861 3133
2862 $class->SUPER::new ( 3134 my $self = $class->SUPER::new (
3135 @_,
3136 );
3137
3138 $self->{current} = $self->{children}[0]
3139 if @{ $self->{children} };
3140
3141 $self
3142}
3143
3144sub add {
3145 my ($self, @widgets) = @_;
3146
3147 $self->SUPER::add (@widgets);
3148
3149 $self->{current} = $self->{children}[0]
3150 if @{ $self->{children} };
3151}
3152
3153sub set_current_page {
3154 my ($self, $page_or_widget) = @_;
3155
3156 my $widget = ref $page_or_widget
3157 ? $page_or_widget
3158 : $self->{children}[$page_or_widget];
3159
3160 $self->{current} = $widget;
3161 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3162
3163 $self->emit (page_changed => $self->{current});
3164
3165 $self->realloc;
3166}
3167
3168sub visible_children {
3169 $_[0]{current}
3170}
3171
3172sub size_request {
3173 my ($self) = @_;
3174
3175 $self->{current}->size_request
3176}
3177
3178sub invoke_size_allocate {
3179 my ($self, $w, $h) = @_;
3180
3181 $self->{current}->configure (0, 0, $w, $h);
3182
3183 1
3184}
3185
3186sub _draw {
3187 my ($self) = @_;
3188
3189 $self->{current}->draw;
3190}
3191
3192#############################################################################
3193
3194package CFClient::UI::Notebook;
3195
3196our @ISA = CFClient::UI::VBox::;
3197
3198sub new {
3199 my $class = shift;
3200
3201 my $self = $class->SUPER::new (
3202 buttonbar => (new CFClient::UI::Buttonbar),
3203 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3204 # filter => # will be put between multiplexer and $self
3205 @_,
3206 );
3207
3208 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3209 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3210
3211 $self
3212}
3213
3214sub add {
3215 my ($self, $title, $widget, $tooltip) = @_;
3216
3217 Scalar::Util::weaken $self;
3218
3219 $self->{buttonbar}->add (new CFClient::UI::Button
3220 markup => $title,
3221 tooltip => $tooltip,
3222 on_activate => sub { $self->set_current_page ($widget) },
3223 );
3224
3225 $self->{multiplexer}->add ($widget);
3226}
3227
3228sub set_current_page {
3229 my ($self, $page) = @_;
3230
3231 $self->{multiplexer}->set_current_page ($page);
3232 $self->emit (page_changed => $self->{multiplexer}{current});
3233}
3234
3235#############################################################################
3236
3237package CFClient::UI::Combobox;
3238
3239use utf8;
3240
3241our @ISA = CFClient::UI::Button::;
3242
3243sub new {
3244 my $class = shift;
3245
3246 my $self = $class->SUPER::new (
3247 options => [], # [value, title, longdesc], ...
3248 value => undef,
3249 @_,
3250 );
3251
3252 $self->_set_value ($self->{value});
3253
3254 $self
3255}
3256
3257sub invoke_button_down {
3258 my ($self, $ev) = @_;
3259
3260 my @menu_items;
3261
3262 for (@{ $self->{options} }) {
3263 my ($value, $title, $tooltip) = @$_;
3264
3265 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3266 }
3267
3268 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3269}
3270
3271sub _set_value {
3272 my ($self, $value) = @_;
3273
3274 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3275 or return;
3276
3277 $self->{value} = $item->[0];
3278 $self->set_markup ("$item->[1] ⇓");
3279 $self->set_tooltip ($item->[2]);
3280}
3281
3282sub set_value {
3283 my ($self, $value) = @_;
3284
3285 return unless $self->{value} ne $value;
3286
3287 $self->_set_value ($value);
3288 $self->emit (changed => $value);
3289}
3290
3291#############################################################################
3292
3293package CFClient::UI::Statusbox;
3294
3295our @ISA = CFClient::UI::VBox::;
3296
3297sub new {
3298 my $class = shift;
3299
3300 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3301 fontsize => 0.8,
2864 @_, 3302 @_,
2865 ) 3303 );
3304
3305 Scalar::Util::weaken (my $this = $self);
3306
3307 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3308
3309 $self
2866} 3310}
2867 3311
2868sub reorder { 3312sub reorder {
2869 my ($self) = @_; 3313 my ($self) = @_;
2870 my $NOW = time; 3314 my $NOW = Time::HiRes::time;
3315
3316 # freeze display when hovering over any label
3317 return if $CFClient::UI::TOOLTIP->{owner}
3318 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3319 values %{ $self->{item} };
2871 3320
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3321 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3322 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3323 }
2875 3324
… …
2878 my @items = sort { 3327 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3328 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3329 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3330 } values %{ $self->{item} };
2882 3331
3332 $self->{timer}->interval (1);
3333
2883 my $count = 10 + 1; 3334 my $count = 10 + 1;
2884 for my $item (@items) { 3335 for my $item (@items) {
2885 last unless --$count; 3336 last unless --$count;
2886 3337
2887 push @widgets, $item->{label} ||= do { 3338 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3339 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3340 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3341 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3342 : $item->{text};
2892 3343
… …
2900 tooltip => $item->{tooltip}, 3351 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3352 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3353 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3354 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3355 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3356 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3357 can_events => 1,
2907 can_hover => 1 3358 can_hover => 1
2908 }; 3359 };
3360
3361 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3362 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3363 $label->update;
3364 $label->set_max_size (undef, $label->{req_h} * $diff)
3365 if $diff < 1;
3366 $self->{timer}->interval (1/30);
3367 } else {
3368 $label->{fg}[3] = $item->{fg}[3] || 1;
3369 }
3370
3371 push @widgets, $label;
2909 } 3372 }
2910 3373
2911 $self->clear; 3374 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3375 $self->SUPER::add (reverse @widgets);
2913} 3376}
… …
2918 $text =~ s/^\s+//; 3381 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3382 $text =~ s/\s+$//;
2920 3383
2921 return unless $text; 3384 return unless $text;
2922 3385
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3386 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3387
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3388 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3389
2927 if (my $item = $self->{item}{$group}) { 3390 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3391 if ($item->{text} eq $text) {
2929 $item->{count}++; 3392 $item->{count}++;
2930 } else { 3393 } else {
2931 $item->{count} = 1; 3394 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3395 $item->{text} = $item->{tooltip} = $text;
2933 } 3396 }
2934 $item->{id} = ++$self->{id}; 3397 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3398 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3399 delete $item->{label};
2937 } else { 3400 } else {
2938 $self->{item}{$group} = { 3401 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3402 id => ++$self->{id},
… …
2958 3421
2959 $self->reorder; 3422 $self->reorder;
2960 $self->SUPER::reconfigure; 3423 $self->SUPER::reconfigure;
2961} 3424}
2962 3425
3426sub destroy {
3427 my ($self) = @_;
3428
3429 $self->{timer}->cancel;
3430
3431 $self->SUPER::destroy;
3432}
3433
2963############################################################################# 3434#############################################################################
2964 3435
2965package CFClient::UI::Root; 3436package CFClient::UI::Inventory;
2966 3437
2967our @ISA = CFClient::UI::Container::; 3438our @ISA = CFClient::UI::ScrolledWindow::;
2968
2969use CFClient::OpenGL;
2970 3439
2971sub new { 3440sub new {
2972 my $class = shift; 3441 my $class = shift;
2973 3442
2974 $class->SUPER::new ( 3443 my $self = $class->SUPER::new (
3444 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3445 @_,
3446 );
3447
3448 $self
3449}
3450
3451sub set_items {
3452 my ($self, $items) = @_;
3453
3454 $self->{child}->clear;
3455 return unless $items;
3456
3457 my @items = sort {
3458 ($a->{type} <=> $b->{type})
3459 or ($a->{name} cmp $b->{name})
3460 } @$items;
3461
3462 $self->{real_items} = \@items;
3463
3464 my $row = 0;
3465 for my $item (@items) {
3466 CFClient::Item::update_widgets $item;
3467
3468 $self->{child}->add (0, $row, $item->{face_widget});
3469 $self->{child}->add (1, $row, $item->{desc_widget});
3470 $self->{child}->add (2, $row, $item->{weight_widget});
3471
3472 $row++;
3473 }
3474}
3475
3476#############################################################################
3477
3478package CFClient::UI::BindEditor;
3479
3480our @ISA = CFClient::UI::FancyFrame::;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3486
3487 $self->add (my $vb = new CFClient::UI::VBox);
3488
3489
3490 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3491 text => "start recording",
3492 tooltip => "Start/Stops recording of actions."
3493 ."All subsequent actions after the recording started will be captured."
3494 ."The actions are displayed after the record was stopped."
3495 ."To bind the action you have to click on the 'Bind' button",
3496 on_activate => sub {
3497 unless ($self->{recording}) {
3498 $self->start;
3499 } else {
3500 $self->stop;
3501 }
3502 });
3503
3504 $vb->add (new CFClient::UI::Label text => "Actions:");
3505 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3506
3507 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3508 $vb->add (my $hb = new CFClient::UI::HBox);
3509 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3510 $hb->add (new CFClient::UI::Button
3511 text => "bind",
3512 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3513 on_activate => sub {
3514 $self->ask_for_bind;
3515 });
3516
3517 $vb->add (my $hb = new CFClient::UI::HBox);
3518 $hb->add (new CFClient::UI::Button
3519 text => "ok",
3520 expand => 1,
3521 tooltip => "This closes the binding editor and saves the binding",
3522 on_activate => sub {
3523 $self->hide;
3524 $self->commit;
3525 });
3526
3527 $hb->add (new CFClient::UI::Button
3528 text => "cancel",
3529 expand => 1,
3530 tooltip => "This closes the binding editor without saving",
3531 on_activate => sub {
3532 $self->hide;
3533 $self->{binding_cancel}->()
3534 if $self->{binding_cancel};
3535 });
3536
3537 $self->update_binding_widgets;
3538
3539 $self
3540}
3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3554sub commit {
3555 my ($self) = @_;
3556 my ($mod, $sym, $cmds) = $self->get_binding;
3557 if ($sym != 0 && @$cmds > 0) {
3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3559 ."'. Don't forget 'Save Config'!");
3560 $self->{binding_change}->($mod, $sym, $cmds)
3561 if $self->{binding_change};
3562 } else {
3563 $::STATUSBOX->add ("No action bound, no key or action specified!");
3564 $self->{binding_cancel}->()
3565 if $self->{binding_cancel};
3566 }
3567}
3568
3569sub start {
3570 my ($self) = @_;
3571
3572 $self->{rec_btn}->set_text ("stop recording");
3573 $self->{recording} = 1;
3574 $self->clear_command_list;
3575 $::CONN->start_record if $::CONN;
3576}
3577
3578sub stop {
3579 my ($self) = @_;
3580
3581 $self->{rec_btn}->set_text ("start recording");
3582 $self->{recording} = 0;
3583
3584 my $rec;
3585 $rec = $::CONN->stop_record if $::CONN;
3586 return unless ref $rec eq 'ARRAY';
3587 $self->set_command_list ($rec);
3588}
3589
3590
3591sub ask_for_bind_and_commit {
3592 my ($self) = @_;
3593 $self->ask_for_bind (1);
3594}
3595
3596sub ask_for_bind {
3597 my ($self, $commit, $end_cb) = @_;
3598
3599 CFClient::Binder::open_binding_dialog (sub {
3600 my ($mod, $sym) = @_;
3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3602 $self->update_binding_widgets;
3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3605 });
3606}
3607
3608# $mod and $sym are the modifiers and key symbol
3609# $cmds is a array ref of strings (the commands)
3610# $cb is the callback that is executed on OK
3611# $ccb is the callback that is executed on CANCEL and
3612# when the binding was unsuccessful on OK
3613sub set_binding {
3614 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3615
3616 $self->clear_command_list;
3617 $self->{recording} = 0;
3618 $self->{rec_btn}->set_text ("start recording");
3619
3620 $self->{binding} = [$mod, $sym];
3621 $self->{commands} = $cmds;
3622
3623 $self->{binding_change} = $cb;
3624 $self->{binding_cancel} = $ccb;
3625
3626 $self->update_binding_widgets;
3627}
3628
3629# this is a shortcut method that asks for a binding
3630# and then just binds it.
3631sub do_quick_binding {
3632 my ($self, $cmds, $end_cb) = @_;
3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3634 $self->ask_for_bind (1, $end_cb);
3635}
3636
3637sub update_binding_widgets {
3638 my ($self) = @_;
3639 my ($mod, $sym, $cmds) = $self->get_binding;
3640 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3641 $self->set_command_list ($cmds);
3642}
3643
3644sub get_binding {
3645 my ($self) = @_;
3646 return (
3647 $self->{binding}->[0],
3648 $self->{binding}->[1],
3649 [ grep { defined $_ } @{$self->{commands}} ]
3650 );
3651}
3652
3653sub clear_command_list {
3654 my ($self) = @_;
3655 $self->{cmdbox}->clear ();
3656}
3657
3658sub set_command_list {
3659 my ($self, $cmds) = @_;
3660
3661 $self->{cmdbox}->clear ();
3662 $self->{commands} = $cmds;
3663
3664 my $idx = 0;
3665
3666 for (@$cmds) {
3667 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3668
3669 my $i = $idx;
3670 $hb->add (new CFClient::UI::Label text => $_);
3671 $hb->add (new CFClient::UI::Button
3672 text => "delete",
3673 tooltip => "Deletes the action from the record",
3674 on_activate => sub {
3675 $self->{cmdbox}->remove ($hb);
3676 $cmds->[$i] = undef;
3677 });
3678
3679
3680 $idx++
3681 }
3682}
3683
3684#############################################################################
3685
3686package CFClient::UI::SpellList;
3687
3688our @ISA = CFClient::UI::Table::;
3689
3690sub new {
3691 my $class = shift;
3692
3693 my $self = $class->SUPER::new (
3694 binding => [],
3695 commands => [],
3696 @_,
3697 )
3698}
3699
3700my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3701
3702my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3703 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3704my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3705 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3706my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3707 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3708my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3709 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3710my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3711 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3712
3713sub rebuild_spell_list {
3714 my ($self) = @_;
3715
3716 $CFClient::UI::ROOT->on_refresh ($self => sub {
3717 $self->clear;
3718
3719 return unless $::CONN;
3720
3721 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3722 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3723 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3724 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3725 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3726
3727 my $row = 0;
3728
3729 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3730 my $spell = $self->{spell}{$_};
3731
3732 $row++;
3733
3734 my $spell_cb = sub {
3735 my ($widget, $ev) = @_;
3736
3737 if ($ev->{button} == 1) {
3738 $::CONN->user_send ("cast $spell->{name}");
3739 } elsif ($ev->{button} == 2) {
3740 $::CONN->user_send ("invoke $spell->{name}");
3741 } elsif ($ev->{button} == 3) {
3742 (new CFClient::UI::Menu
3743 items => [
3744 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3745 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3746 ],
3747 )->popup ($ev);
3748 } else {
3749 return 0;
3750 }
3751
3752 1
3753 };
3754
3755 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3756
3757 #TODO: add path info to tooltip
3758 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3759
3760 $self->add (0, $row, new CFClient::UI::Face
3761 face => $spell->{face},
3762 can_hover => 1,
3763 can_events => 1,
3764 tooltip => $tooltip,
3765 on_button_down => $spell_cb,
3766 );
3767
3768 $self->add (1, $row, new CFClient::UI::Label
3769 expand => 1,
3770 text => $spell->{name},
3771 can_hover => 1,
3772 can_events => 1,
3773 tooltip => $tooltip,
3774 on_button_down => $spell_cb,
3775 );
3776
3777 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3778 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3779 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3780 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3781 }
3782 });
3783}
3784
3785sub add_spell {
3786 my ($self, $spell) = @_;
3787
3788 $self->{spell}->{$spell->{name}} = $spell;
3789 $self->rebuild_spell_list;
3790}
3791
3792sub remove_spell {
3793 my ($self, $spell) = @_;
3794
3795 delete $self->{spell}->{$spell->{name}};
3796 $self->rebuild_spell_list;
3797}
3798
3799sub clear_spells {
3800 my ($self) = @_;
3801
3802 $self->{spell} = {};
3803 $self->rebuild_spell_list;
3804}
3805
3806#############################################################################
3807
3808package CFClient::UI::Root;
3809
3810our @ISA = CFClient::UI::Container::;
3811
3812use List::Util qw(min max);
3813
3814use CFClient::OpenGL;
3815
3816sub new {
3817 my $class = shift;
3818
3819 my $self = $class->SUPER::new (
2975 visible => 1, 3820 visible => 1,
2976 @_, 3821 @_,
2977 ) 3822 );
2978}
2979 3823
2980sub configure { 3824 Scalar::Util::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3825
2983 $self->{w} = $w; 3826 $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} 3827}
2993 3828
2994sub size_request { 3829sub size_request {
2995 my ($self) = @_; 3830 my ($self) = @_;
2996 3831
2997 ($self->{w}, $self->{h}) 3832 ($self->{w}, $self->{h})
2998} 3833}
2999 3834
3835sub _to_pixel {
3836 my ($coord, $size, $max) = @_;
3837
3838 $coord =
3839 $coord eq "center" ? ($max - $size) * 0.5
3840 : $coord eq "max" ? $max
3841 : $coord;
3842
3843 $coord = 0 if $coord < 0;
3844 $coord = $max - $size if $coord > $max - $size;
3845
3846 int $coord + 0.5
3847}
3848
3000sub size_allocate { 3849sub invoke_size_allocate {
3001 my ($self, $w, $h) = @_; 3850 my ($self, $w, $h) = @_;
3002 3851
3003 for my $child ($self->children) { 3852 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3853 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3854
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3855 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3856 $Y = $child->{force_y} if exists $child->{force_y};
3008 3857
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3858 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3859 $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 3860
3017 $child->configure ($X, $Y, $W, $H); 3861 $child->configure ($X, $Y, $W, $H);
3018 } 3862 }
3863
3864 1
3019} 3865}
3020 3866
3021sub coord2local { 3867sub coord2local {
3022 my ($self, $x, $y) = @_; 3868 my ($self, $x, $y) = @_;
3023 3869
… …
3031} 3877}
3032 3878
3033sub update { 3879sub update {
3034 my ($self) = @_; 3880 my ($self) = @_;
3035 3881
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3882 $::WANT_REFRESH++;
3038} 3883}
3039 3884
3040sub add { 3885sub add {
3041 my ($self, @children) = @_; 3886 my ($self, @children) = @_;
3042 3887
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3888 $_->{is_toplevel} = 1
3045 3889 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3890
3051 $self->SUPER::add (@children); 3891 $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} 3892}
3059 3893
3060sub remove { 3894sub remove {
3061 my ($self, @children) = @_; 3895 my ($self, @children) = @_;
3062 3896
3063 $self->SUPER::remove (@children); 3897 $self->SUPER::remove (@children);
3898
3899 delete $self->{is_toplevel}
3900 for @children;
3064 3901
3065 while (@children) { 3902 while (@children) {
3066 my $w = pop @children; 3903 my $w = pop @children;
3067 push @children, $w->children; 3904 push @children, $w->children;
3068 $w->set_invisible; 3905 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3924 while ($self->{refresh_hook}) {
3088 $_->() 3925 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3926 for values %{delete $self->{refresh_hook}};
3090 } 3927 }
3091 3928
3092 if ($self->{check_size}) { 3929 if ($self->{realloc}) {
3930 my %queue;
3093 my @queue; 3931 my @queue;
3932 my $widget;
3094 3933
3095 for (;;) { 3934 outer:
3096 if ($self->{check_size}) { 3935 while () {
3097 #TODO use array-of-depth approach 3936 if (my $realloc = delete $self->{realloc}) {
3937 for $widget (values %$realloc) {
3938 $widget->{visible} or next; # do not resize invisible widgets
3098 3939
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3940 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3941
3942 push @{ $queue[$widget->{visible}] }, $widget;
3943 }
3101 } 3944 }
3102 3945
3946 while () {
3947 @queue or last outer;
3948
3103 my $widget = pop @queue || last; 3949 $widget = pop @{ $queue[-1] || [] }
3104 3950 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 3951
3952 pop @queue;
3953 }
3954
3955 delete $queue{$widget+0};
3956
3957 my ($w, $h) = $widget->size_request;
3958
3959 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3960 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3961
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964
3965 $w = $widget->{force_w} if exists $widget->{force_w};
3966 $h = $widget->{force_h} if exists $widget->{force_h};
3967
3968 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3969 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 3970 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 3971 $widget->{req_h} = $h;
3117 3972
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3973 $self->{size_alloc}{$widget+0} = $widget;
3119 3974
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 3975 if (my $parent = $widget->{parent}) {
3976 $self->{realloc}{$parent+0} = $parent
3977 unless $queue{$parent+0};
3978
3979 $parent->{force_size_alloc} = 1;
3980 $self->{size_alloc}{$parent+0} = $parent;
3981 }
3122 } 3982 }
3983
3984 delete $self->{realloc}{$widget+0};
3123 } 3985 }
3124 } 3986 }
3125 3987
3126 while ($self->{size_alloc}) { 3988 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 3989 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 3990 values %$size_alloc;
3991
3992 while () {
3993 my $widget = pop @queue || last;
3994
3995 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 3996
3130 $w = 0 if $w < 0; 3997 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 3998 $h = 0 if $h < 0;
3132 3999
4000 $w = int $w + 0.5;
4001 $h = int $h + 0.5;
4002
4003 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4004 $widget->{old_w} = $widget->{w};
4005 $widget->{old_h} = $widget->{h};
4006
3133 $widget->{w} = $w; 4007 $widget->{w} = $w;
3134 $widget->{h} = $h; 4008 $widget->{h} = $h;
4009
3135 $widget->emit (size_allocate => $w, $h); 4010 $widget->emit (size_allocate => $w, $h);
4011 }
3136 } 4012 }
3137 } 4013 }
3138 4014
3139 while ($self->{post_alloc_hook}) { 4015 while ($self->{post_alloc_hook}) {
3140 $_->() 4016 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 4017 for values %{delete $self->{post_alloc_hook}};
3142 } 4018 }
4019
3143 4020
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4021 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4022 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 4023 glClear GL_COLOR_BUFFER_BIT;
3147 4024
… …
3149 glLoadIdentity; 4026 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4027 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 4028 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 4029 glLoadIdentity;
3153 4030
4031 {
4032 package CFClient::UI::Base;
4033
4034 ($draw_x, $draw_y, $draw_w, $draw_h) =
4035 (0, 0, $self->{w}, $self->{h});
4036 }
4037
3154 $self->_draw; 4038 $self->_draw;
3155} 4039}
3156 4040
3157############################################################################# 4041#############################################################################
3158 4042

Diff Legend

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