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

Diff Legend

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