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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 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->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_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};
223 } 235 }
224 236
225 $self 237 $self
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
236} 238}
237 239
238sub destroy { 240sub destroy {
239 my ($self) = @_; 241 my ($self) = @_;
240 242
… …
242 %$self = (); 244 %$self = ();
243} 245}
244 246
245sub show { 247sub show {
246 my ($self) = @_; 248 my ($self) = @_;
249
247 return if $self->{parent}; 250 return if $self->{parent};
248 251
249 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
250} 253}
251 254
252sub show_centered { 255sub set_visible {
253 my ($self) = @_; 256 my ($self) = @_;
257
254 return if $self->{parent}; 258 return if $self->{visible};
255 259
256 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
257 262
258 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
259 "centered $self" => sub { 264
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
261 }, 266
262 ); 267 $_->set_visible for $self->children;
263} 268}
264 269
265sub set_invisible { 270sub set_invisible {
266 my ($self) = @_; 271 my ($self) = @_;
267 272
268 return unless $self->{visible}; 273 return unless $self->{visible};
269 274
270 # broken show/hide model 275 $_->set_invisible for $self->children;
271 276
277 delete $self->{visible};
272 delete $self->{root}; 278 delete $self->{root};
273 delete $self->{visible};
274 279
275 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
276 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
277 282
278 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
279 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
280 285
281 $self->focus_out; 286 $self->emit ("focus_out");
282
283 $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;
284} 305}
285 306
286sub hide { 307sub hide {
287 my ($self) = @_; 308 my ($self) = @_;
288 309
… …
290 311
291 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
292 if $self->{parent}; 313 if $self->{parent};
293} 314}
294 315
295sub move { 316sub move_abs {
296 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
297 318
298 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
299 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
300 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
301 322
302 $self->update; 323 $self->update;
303} 324}
304 325
305sub set_size { 326sub set_size {
306 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
307 328
308 $self->{user_w} = $w; 329 $self->{force_w} = $w;
309 $self->{user_h} = $h; 330 $self->{force_h} = $h;
310 331
311 $self->check_size; 332 $self->realloc;
312} 333}
313 334
314sub size_request { 335sub size_request {
315 require Carp; 336 require Carp;
316 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
317} 338}
318 339
340sub baseline_shift {
341 0
342}
343
319sub configure { 344sub configure {
320 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
321 346
322 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
323 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
324 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
325 352
326 # use alignment to adjust x, y 353 # use alignment to adjust x, y
327 354
328 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
329 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
330
331 ($w, $h) = ($w2, $h2);
332 } 357 }
333 358
334 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
335 $self->{x} = $x; 360 $self->{x} = $x;
336 $self->{y} = $y; 361 $self->{y} = $y;
337 $self->update; 362 $self->update;
338 } 363 }
339 364
340 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
342 }
343}
344 367
345sub size_allocate { 368 $self->{alloc_w} = $w;
346 # nothing to be done 369 $self->{alloc_h} = $h;
347}
348 370
349sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
350 my ($self) = @_; 372 }
351
352 $self->check_size (1);
353 $self->update;
354} 373}
355 374
356sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
357} 381}
358 382
359sub set_max_size { 383sub set_max_size {
360 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
361 385
362 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
364} 390}
365 391
366sub set_tooltip { 392sub set_tooltip {
367 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
368 394
… …
373 399
374 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
375 401
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
379 } 405 }
380} 406}
381 407
382# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
383sub coord2local { 409sub coord2local {
… …
391 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
392 418
393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
394} 420}
395 421
396sub focus_in { 422sub invoke_focus_in {
397 my ($self) = @_; 423 my ($self) = @_;
398 424
399 return if $FOCUS == $self; 425 return if $FOCUS == $self;
400 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
401 427
402 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
403 429
404 $self->_emit (focus_in => $focus); 430 $self->update;
405 431
406 $focus->update if $focus; 432 0
407 $FOCUS->update;
408} 433}
409 434
410sub focus_out { 435sub invoke_focus_out {
411 my ($self) = @_; 436 my ($self) = @_;
412 437
413 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
414 439
415 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
416 441
417 $self->_emit (focus_out => $focus); 442 $self->update;
418 443
419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
422 unless $FOCUS; 445 unless $FOCUS;
423}
424 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
425sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
426sub button_up { } 458sub invoke_button_up { 0 }
427sub key_down { } 459sub invoke_key_down { 0 }
428sub key_up { } 460sub invoke_key_up { 0 }
429 461
430sub button_down { 462sub invoke_button_down {
431 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
432 464
433 $self->focus_in; 465 $self->grab_focus;
434}
435 466
436sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
437sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
438sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
439sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
440sub 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 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485}
486
487sub find_widget {
488 my ($self, $x, $y) = @_;
489
490 return () unless $self->{can_events};
491
492 return $self
493 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
494 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
495
496 ()
497}
498
499sub set_parent {
500 my ($self, $parent) = @_;
501
502 Scalar::Util::weaken ($self->{parent} = $parent);
503 $self->set_visible if $parent->{visible};
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
441 537
442sub draw { 538sub draw {
443 my ($self) = @_; 539 my ($self) = @_;
444 540
445 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
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);
446 550
447 glPushMatrix; 551 glPushMatrix;
448 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
449 $self->_draw;
450 glPopMatrix;
451 553
452 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
453 my ($x, $y) = @$self{qw(x y)};
454
455 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
456 glEnable GL_BLEND; 556 glEnable GL_BLEND;
457 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
458 glBegin GL_QUADS; 558 glBegin GL_QUADS;
459 glVertex $x , $y; 559 glVertex 0 , 0;
460 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
461 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
462 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
463 glEnd; 563 glEnd;
464 glDisable GL_BLEND; 564 glDisable GL_BLEND;
465 } 565 }
466 566
467 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
468 glPushMatrix; 568 glPushMatrix;
469 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
471 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
472 glVertex 0 , 0; 572 glVertex 0 , 0;
473 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
474 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
475 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
476 glEnd; 576 glEnd;
477 glPopMatrix; 577 glPopMatrix;
478 #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;
479 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
480} 583}
481 584
482sub _draw { 585sub _draw {
483 my ($self) = @_; 586 my ($self) = @_;
484 587
485 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
486} 589}
487 590
488sub find_widget {
489 my ($self, $x, $y) = @_;
490
491 return () unless $self->{can_events};
492
493 return $self
494 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
495 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
496
497 ()
498}
499
500sub set_parent {
501 my ($self, $parent) = @_;
502
503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
518}
519
520sub check_size {
521 my ($self, $forced) = @_;
522
523 $self->{force_alloc} = 1 if $forced;
524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
525}
526
527sub update {
528 my ($self) = @_;
529
530 $self->{parent}->update
531 if $self->{parent};
532}
533
534sub connect {
535 my ($self, $signal, $cb) = @_;
536
537 push @{ $self->{signal_cb}{$signal} }, $cb;
538}
539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
546sub emit {
547 my ($self, $signal, @args) = @_;
548
549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
555}
556
557sub DESTROY { 591sub DESTROY {
558 my ($self) = @_; 592 my ($self) = @_;
559 593
594 return if CFClient::in_destruct;
595
560 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
561 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 600}
563 601
564############################################################################# 602#############################################################################
565 603
566package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
591 629
592 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
594 632
595 glEnable GL_BLEND; 633 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 635 glColor_premultiply @$color;
598 636
599 glBegin GL_QUADS; 637 glBegin GL_QUADS;
600 glVertex 0 , 0; 638 glVertex 0 , 0;
601 glVertex 0 , $h; 639 glVertex 0 , $h;
602 glVertex $w, $h; 640 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 656 $class->SUPER::new (can_events => 0, %arg);
619} 657}
620 658
621sub size_request { 659sub size_request {
622 (0, 0) 660 my ($self) = @_;
661
662 ($self->{w} + 0, $self->{h} + 0)
623} 663}
624 664
625sub draw { } 665sub draw { }
626 666
627############################################################################# 667#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
632 672
633sub new { 673sub new {
634 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
635 675
636 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
637 677
638 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
639 children => [], 679 children => [],
640 can_events => 0, 680 can_events => 0,
641 %arg, 681 %arg,
642 ); 682 );
683
643 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
644 686
645 $self 687 $self
646} 688}
647 689
648sub add { 690sub add {
… …
656 $self->{children} = [ 698 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 699 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 700 @{$self->{children}}, @widgets
659 ]; 701 ];
660 702
661 $self->check_size (1); 703 $self->realloc;
662 $self->update;
663} 704}
664 705
665sub children { 706sub children {
666 @{ $_[0]{children} } 707 @{ $_[0]{children} }
667} 708}
… …
672 delete $child->{parent}; 713 delete $child->{parent};
673 $child->hide; 714 $child->hide;
674 715
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 717
677 $self->check_size (1); 718 $self->realloc;
678 $self->update;
679} 719}
680 720
681sub clear { 721sub clear {
682 my ($self) = @_; 722 my ($self) = @_;
683 723
… …
687 for (@$children) { 727 for (@$children) {
688 delete $_->{parent}; 728 delete $_->{parent};
689 $_->hide; 729 $_->hide;
690 } 730 }
691 731
692 $self->check_size; 732 $self->realloc;
693 $self->update;
694} 733}
695 734
696sub find_widget { 735sub find_widget {
697 my ($self, $x, $y) = @_; 736 my ($self, $x, $y) = @_;
698 737
699 $x -= $self->{x}; 738 $x -= $self->{x};
700 $y -= $self->{y}; 739 $y -= $self->{y};
701 740
702 my $res; 741 my $res;
703 742
704 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
706 and return $res; 745 and return $res;
707 } 746 }
708 747
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 769}
731 770
732sub add { 771sub add {
733 my ($self, $child) = @_; 772 my ($self, $child) = @_;
734 773
735 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
738} 776}
739 777
740sub remove { 778sub remove {
741 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
750 788
751sub size_request { 789sub size_request {
752 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
753} 791}
754 792
755sub size_allocate { 793sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
757 795
758 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
759} 799}
760 800
761############################################################################# 801#############################################################################
802
803# back-buffered drawing area
762 804
763package CFClient::UI::Window; 805package CFClient::UI::Window;
764 806
765our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
766 808
… …
777 819
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 821 $self->SUPER::update;
780} 822}
781 823
782sub size_allocate { 824sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
784 826
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
787} 830}
788 831
789sub _render { 832sub _render {
833 my ($self) = @_;
834
790 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
791} 836}
792 837
793sub render_child { 838sub render_child {
794 my ($self) = @_; 839 my ($self) = @_;
795 840
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
799 844
845 {
846 package CFClient::UI::Base;
847
848 ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h});
850 }
851
800 $self->_render; 852 $self->_render;
801 }; 853 };
802} 854}
803 855
804sub _draw { 856sub _draw {
805 my ($self) = @_; 857 my ($self) = @_;
806 858
807 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
808 860
809 my $tex = $self->{texture} 861 my $tex = $self->{texture}
810 or return; 862 or return;
811 863
812 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
815 867
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 869
818 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
819} 871}
… …
835} 887}
836 888
837sub size_request { 889sub size_request {
838 my ($self) = @_; 890 my ($self) = @_;
839 891
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 893
842 @$self{qw(child_w child_h)} 894 $w = 10 if $self->{scroll_x};
843} 895 $h = 10 if $self->{scroll_y};
844 896
897 ($w, $h)
898}
899
845sub size_allocate { 900sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
847 902
903 my $child = $self->child;
904
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 907
851 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
852 $self->update; 909 $self->update;
910
911 1
853} 912}
854 913
855sub set_offset { 914sub set_offset {
856 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
857 916
… …
890} 949}
891 950
892sub _render { 951sub _render {
893 my ($self) = @_; 952 my ($self) = @_;
894 953
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
955 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
956
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 958
897 $self->SUPER::_render; 959 $self->SUPER::_render;
898} 960}
899 961
… …
902package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
903 965
904our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
905 967
906sub new { 968sub new {
907 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
908 972
909 my $self; 973 my $self;
910 974
911 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
912 vertical => 1, 976 vertical => 1,
… …
917 ; 981 ;
918 982
919 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
921 slider => $slider, 985 slider => $slider,
922 @_, 986 %arg,
923 ); 987 );
924 988
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
928 991
929 $self 992 $self
930} 993}
931 994
995#TODO# update range on size_allocate depending on child
996
997sub add {
998 my ($self, $widget) = @_;
999
1000 $self->{vp}->add ($self->{child} = $widget);
1001}
1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
932sub update { 1017sub update {
933 my ($self) = @_; 1018 my ($self) = @_;
934 1019
935 $self->SUPER::update; 1020 $self->SUPER::update;
936 1021
937 # todo: overwrite size_allocate of child 1022 $self->update_slider;
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940} 1023}
941 1024
942sub size_allocate { 1025sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
944 1027
1028 $self->update_slider;
1029
945 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1031}
950
951#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll
953 1032
954############################################################################# 1033#############################################################################
955 1034
956package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
957 1036
… …
973 1052
974 if ($self->{bg}) { 1053 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
976 1055
977 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
980 1059
981 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
982 glVertex 0 , 0; 1061 glVertex 0 , 0;
983 glVertex 0 , $h; 1062 glVertex 0 , $h;
984 glVertex $w, $h; 1063 glVertex $w, $h;
… …
997 1076
998our @ISA = CFClient::UI::Bin::; 1077our @ISA = CFClient::UI::Bin::;
999 1078
1000use CFClient::OpenGL; 1079use CFClient::OpenGL;
1001 1080
1002my @tex = 1081my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1;
1084
1085my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1004 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1088
1006sub new { 1089sub new {
1007 my $class = shift; 1090 my ($class, %arg) = @_;
1008
1009 # TODO: user_x, user_y, overwrite moveto?
1010 1091
1011 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1095 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1096 can_events => 1,
1017 @_ 1097 min_w => 64,
1098 min_h => 32,
1099 %arg,
1018 ); 1100 );
1019 1101
1020 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1021 align => 0, 1103 align => 0,
1022 valign => 1, 1104 valign => 1,
1023 text => $self->{title}, 1105 text => $self->{title},
1024 fontsize => $self->{border}; 1106 fontsize => $self->{border},
1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1025 1117
1026 $self 1118 $self
1119}
1120
1121sub add {
1122 my ($self, @widgets) = @_;
1123
1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1027} 1127}
1028 1128
1029sub border { 1129sub border {
1030 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1031} 1131}
1032 1132
1033sub size_request { 1133sub size_request {
1034 my ($self) = @_; 1134 my ($self) = @_;
1135
1136 $self->{title_widget}->size_request
1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1035 1141
1036 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1037 1143
1038 ( 1144 (
1039 $w + $self->border * 2, 1145 $w + $self->border * 2,
1040 $h + $self->border * 2, 1146 $h + $self->border * 2,
1041 ) 1147 )
1042} 1148}
1043 1149
1044sub size_allocate { 1150sub invoke_size_allocate {
1045 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1046 1152
1153 if ($self->{title_widget}) {
1154 $self->{title_widget}{w} = $w;
1155 $self->{title_widget}{h} = $h;
1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1157 }
1158
1159 my $border = $self->border;
1160
1047 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1049 1163
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1054}
1055 1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1177 1
1178}
1179
1056sub button_down { 1180sub invoke_button_down {
1057 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1058 1182
1059 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1060 my $border = $self->border; 1184 my $border = $self->border;
1061 1185
… …
1074 my ($ev, $x, $y) = @_; 1198 my ($ev, $x, $y) = @_;
1075 1199
1076 my $dx = $ev->{x} - $ox; 1200 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1078 1202
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1205
1084 $self->check_size; 1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1207 $self->realloc;
1085 }; 1208 };
1086 1209
1087 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1091 $self->{motion} = sub { 1214 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1093 1216
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1218
1096 $self->{user_x} = $bx + $x - $ox; 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1220 # HACK: the next line is required to enforce placement
1098 $self->move ($self->{user_x}, $self->{user_y}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->update;
1100 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
1101 } 1227 1
1102} 1228}
1103 1229
1104sub button_up { 1230sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1106 1232
1107 delete $self->{motion}; 1233 ! ! delete $self->{motion}
1108} 1234}
1109 1235
1110sub mouse_motion { 1236sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1112 1238
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
1114} 1242}
1115 1243
1116sub _draw { 1244sub _draw {
1117 my ($self) = @_; 1245 my ($self) = @_;
1118 1246
1247 my $child = $self->{children}[0];
1248
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1251
1122 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1254
1125 my $border = $self->border; 1255 my $border = $self->border;
1126 1256
1127 glColor @{ $self->{border_bg} }; 1257 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1258 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1262
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1264 glColor @{ $self->{bg} };
1135 1265
1136 # TODO: repeat texture not scale 1266 # TODO: repeat texture not scale
1267 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1268 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1269 $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); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1271 }
1147 1272
1148 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1149 1274
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1275 $child->draw;
1276
1277 if ($self->{title_widget}) {
1278 glTranslate 0, $border - $self->{h};
1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1153} 1286}
1154 1287
1155############################################################################# 1288#############################################################################
1156 1289
1157package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1179 my ($self, $x, $y, $child) = @_; 1312 my ($self, $x, $y, $child) = @_;
1180 1313
1181 $child->set_parent ($self); 1314 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1183 1316
1184 $self->check_size (1); 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1185} 1324}
1186 1325
1187# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1327sub clear {
1189 my ($self) = @_; 1328 my ($self) = @_;
… …
1194 for (@children) { 1333 for (@children) {
1195 delete $_->{parent}; 1334 delete $_->{parent};
1196 $_->hide; 1335 $_->hide;
1197 } 1336 }
1198 1337
1199 $self->check_size (1); 1338 $self->realloc;
1200 $self->update;
1201} 1339}
1202 1340
1203sub get_wh { 1341sub get_wh {
1204 my ($self) = @_; 1342 my ($self) = @_;
1205 1343
… …
1231 (sum @$ws), 1369 (sum @$ws),
1232 (sum @$hs), 1370 (sum @$hs),
1233 ) 1371 )
1234} 1372}
1235 1373
1236sub size_allocate { 1374sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1238 1376
1239 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1240 1378
1241 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1273 } 1411 }
1274 1412
1275 $y += $row_h; 1413 $y += $row_h;
1276 } 1414 }
1277 1415
1416 1
1278} 1417}
1279 1418
1280sub find_widget { 1419sub find_widget {
1281 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1282 1421
… …
1301 } 1440 }
1302} 1441}
1303 1442
1304############################################################################# 1443#############################################################################
1305 1444
1445package CFClient::UI::Box;
1446
1447our @ISA = CFClient::UI::Container::;
1448
1449sub size_request {
1450 my ($self) = @_;
1451
1452 $self->{vertical}
1453 ? (
1454 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1455 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1456 )
1457 : (
1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1460 )
1461}
1462
1463sub invoke_size_allocate {
1464 my ($self, $w, $h) = @_;
1465
1466 my $space = $self->{vertical} ? $h : $w;
1467 my @children = $self->visible_children;
1468
1469 my @req;
1470
1471 if ($self->{homogeneous}) {
1472 @req = ($space / (@children || 1)) x @children;
1473 } else {
1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1475 my $req = List::Util::sum @req;
1476
1477 if ($req > $space) {
1478 # ah well, not enough space
1479 $_ *= $space / $req for @req;
1480 } else {
1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1482
1483 $space = ($space - $req) / $expand; # remaining space to give away
1484
1485 $req[$_] += $space * $children[$_]{expand}
1486 for 0 .. $#children;
1487 }
1488 }
1489
1490 CFClient::UI::harmonize \@req;
1491
1492 my $pos = 0;
1493 for (0 .. $#children) {
1494 my $alloc = $req[$_];
1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1496
1497 $pos += $alloc;
1498 }
1499
1500 1
1501}
1502
1503#############################################################################
1504
1306package CFClient::UI::HBox; 1505package CFClient::UI::HBox;
1307 1506
1308# TODO: wrap into common Box base class
1309
1310our @ISA = CFClient::UI::Container::; 1507our @ISA = CFClient::UI::Box::;
1311 1508
1312sub size_request { 1509sub new {
1313 my ($self) = @_; 1510 my $class = shift;
1314 1511
1315 my @alloc = map [$_->size_request], @{$self->{children}}; 1512 $class->SUPER::new (
1316 1513 vertical => 0,
1317 ( 1514 @_,
1318 (List::Util::sum map $_->[0], @alloc),
1319 (List::Util::max map $_->[1], @alloc),
1320 ) 1515 )
1321} 1516}
1322 1517
1323sub size_allocate {
1324 my ($self, $w, $h) = @_;
1325
1326 ($h, $w) = ($w, $h);
1327
1328 my $children = $self->{children};
1329
1330 my @h = map $_->{req_w}, @$children;
1331
1332 my $req_h = List::Util::sum @h;
1333
1334 if ($req_h > $h) {
1335 # ah well, not enough space
1336 $_ *= $h / $req_h for @h;
1337 } else {
1338 my $exp = List::Util::sum map $_->{expand}, @$children;
1339 $exp ||= 1;
1340
1341 for (0 .. $#$children) {
1342 my $child = $children->[$_];
1343
1344 my $alloc_h = $h[$_];
1345 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1346 $h[$_] = $alloc_h;
1347 }
1348 }
1349
1350 CFClient::UI::harmonize \@h;
1351
1352 my $y = 0;
1353 for (0 .. $#$children) {
1354 my $child = $children->[$_];
1355 my $h = $h[$_];
1356 $child->configure ($y, 0, $h, $w);
1357
1358 $y += $h;
1359 }
1360
1361 1
1362}
1363
1364############################################################################# 1518#############################################################################
1365 1519
1366package CFClient::UI::VBox; 1520package CFClient::UI::VBox;
1367 1521
1368# TODO: wrap into common Box base class
1369
1370our @ISA = CFClient::UI::Container::; 1522our @ISA = CFClient::UI::Box::;
1371 1523
1372sub size_request { 1524sub new {
1373 my ($self) = @_; 1525 my $class = shift;
1374 1526
1375 my @alloc = map [$_->size_request], @{$self->{children}}; 1527 $class->SUPER::new (
1376 1528 vertical => 1,
1377 ( 1529 @_,
1378 (List::Util::max map $_->[0], @alloc),
1379 (List::Util::sum map $_->[1], @alloc),
1380 ) 1530 )
1381}
1382
1383sub size_allocate {
1384 my ($self, $w, $h) = @_;
1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1388 my $children = $self->{children};
1389
1390 my @h = map $_->{req_h}, @$children;
1391
1392 my $req_h = List::Util::sum @h;
1393
1394 if ($req_h > $h) {
1395 # ah well, not enough space
1396 $_ *= $h / $req_h for @h;
1397 } else {
1398 my $exp = List::Util::sum map $_->{expand}, @$children;
1399 $exp ||= 1;
1400
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403
1404 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1405 }
1406 }
1407
1408 CFClient::UI::harmonize \@h;
1409
1410 my $y = 0;
1411 for (0 .. $#$children) {
1412 my $child = $children->[$_];
1413 my $h = $h[$_];
1414 $child->configure (0, $y, $w, $h);
1415
1416 $y += $h;
1417 }
1418
1419 1
1420} 1531}
1421 1532
1422############################################################################# 1533#############################################################################
1423 1534
1424package CFClient::UI::Label; 1535package CFClient::UI::Label;
… …
1441 ellipsise => 3, # end 1552 ellipsise => 3, # end
1442 layout => (new CFClient::Layout), 1553 layout => (new CFClient::Layout),
1443 fontsize => 1, 1554 fontsize => 1,
1444 align => -1, 1555 align => -1,
1445 valign => -1, 1556 valign => -1,
1446 padding => 2, 1557 padding_x => 2,
1558 padding_y => 2,
1447 can_events => 0, 1559 can_events => 0,
1448 %arg 1560 %arg
1449 ); 1561 );
1450 1562
1451 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1478 1590
1479 delete $self->{texture}; 1591 delete $self->{texture};
1480 $self->SUPER::update; 1592 $self->SUPER::update;
1481} 1593}
1482 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1483sub set_text { 1602sub set_text {
1484 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1485 1604
1486 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1487 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1488 1607
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1490 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1491 1609
1610 delete $self->{size_req};
1611 $self->realloc;
1492 $self->update; 1612 $self->update;
1493 $self->check_size;
1494} 1613}
1495 1614
1496sub set_markup { 1615sub set_markup {
1497 my ($self, $markup) = @_; 1616 my ($self, $markup) = @_;
1498 1617
1499 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1500 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1501 1620
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503 1622
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1505 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1506 1624
1625 delete $self->{size_req};
1626 $self->realloc;
1507 $self->update; 1627 $self->update;
1508 $self->check_size;
1509} 1628}
1510 1629
1511sub size_request { 1630sub size_request {
1512 my ($self) = @_; 1631 my ($self) = @_;
1513 1632
1633 $self->{size_req} ||= do {
1514 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1515 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1519 1639
1520 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1521 1641
1522 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 1646
1526 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1527 1648
1528 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1529 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1530 } 1654 };
1531 1655
1532 ( 1656 @{ $self->{size_req} }
1533 $w + $self->{padding} * 2,
1534 $h + $self->{padding} * 2,
1535 )
1536} 1657}
1537 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1538sub size_allocate { 1663sub invoke_size_allocate {
1539 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1540 1665
1666 delete $self->{ox};
1667
1541 delete $self->{texture}; 1668 delete $self->{texture}
1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1542} 1672}
1543 1673
1544sub set_fontsize { 1674sub set_fontsize {
1545 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1546 1676
1547 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1548 delete $self->{texture}; 1679 delete $self->{texture};
1549 1680
1550 $self->update; 1681 $self->realloc;
1551 $self->check_size; 1682}
1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1552} 1691}
1553 1692
1554sub _draw { 1693sub _draw {
1555 my ($self) = @_; 1694 my ($self) = @_;
1556 1695
1557 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1558 1697
1559 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1561 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1562 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566 1705
1567 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1568
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1571 : ($self->{w} - $tex->{w}) * 0.5);
1572
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1575 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1578 }; 1707 };
1579 1708
1580 glEnable GL_TEXTURE_2D; 1709 unless (exists $self->{ox}) {
1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1712 : ($self->{w} - $size->[0]) * 0.5);
1582 1713
1583 if ($tex->{format} == GL_ALPHA) { 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1584 glColor @{$self->{fg}}; 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1716 : ($self->{h} - $size->[1]) * 0.5);
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 } 1717 };
1589 1718
1590 glDisable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1721
1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1591} 1723}
1592 1724
1593############################################################################# 1725#############################################################################
1594 1726
1595package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1609 can_hover => 1, 1741 can_hover => 1,
1610 can_focus => 1, 1742 can_focus => 1,
1611 valign => 0, 1743 valign => 0,
1612 can_events => 1, 1744 can_events => 1,
1613 #text => ... 1745 #text => ...
1746 #hidden => "*",
1614 @_ 1747 @_
1615 ) 1748 )
1616} 1749}
1617 1750
1618sub _set_text { 1751sub _set_text {
… …
1620 1753
1621 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1622 1755
1623 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1624 1757
1625 delete $self->{texture};
1626
1627 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1628 $self->{text} = $text; 1759 $self->{text} = $text;
1629 1760
1630 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1631 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1632 1764
1633 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1634} 1769}
1635 1770
1636sub set_text { 1771sub set_text {
1637 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1638 1773
1639 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1640 $self->_set_text ($text); 1775 $self->_set_text ($text);
1641 $self->update;
1642 $self->check_size;
1643} 1776}
1644 1777
1645sub get_text { 1778sub get_text {
1646 $_[0]{text} 1779 $_[0]{text}
1647} 1780}
… …
1652 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1653 1786
1654 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1655} 1788}
1656 1789
1657sub key_down { 1790sub invoke_key_down {
1658 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1659 1792
1660 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1661 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1662 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1674 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1675 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1676 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1677 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1678 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1679 $self->_emit ('escape'); 1812 $self->emit ('escape');
1680 } elsif ($uni) { 1813 } elsif ($uni) {
1681 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1682 } 1817 }
1683 1818
1684 $self->_set_text ($text); 1819 $self->_set_text ($text);
1685 $self->update;
1686 $self->check_size;
1687}
1688 1820
1821 $self->realloc;
1822
1823 1
1824}
1825
1689sub focus_in { 1826sub invoke_focus_in {
1690 my ($self) = @_; 1827 my ($self) = @_;
1691 1828
1692 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1693 1830
1694 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1695} 1832}
1696 1833
1697sub button_down { 1834sub invoke_button_down {
1698 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1699 1836
1700 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1701 1838
1702 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1703 1840
1704 # byte-index to char-index 1841 # byte-index to char-index
1705 my $text = $self->{text}; 1842 my $text = $self->{text};
1706 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1707 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1708 1845
1709 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1710 $self->update; 1847 $self->update;
1848
1849 1
1711} 1850}
1712 1851
1713sub mouse_motion { 1852sub invoke_mouse_motion {
1714 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1715# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1855
1856 1
1716} 1857}
1717 1858
1718sub _draw { 1859sub _draw {
1719 my ($self) = @_; 1860 my ($self) = @_;
1720 1861
1721 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1722 1863
1723 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1724 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1725 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1726 } else { 1867 } else {
1727 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1728 } 1869 }
1729 1870
1730 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1732 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1733 glVertex 0 , 0; 1874 glVertex 0 , 0;
1734 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1735 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1736 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1761 1902
1762our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1763 1904
1764use CFClient::OpenGL; 1905use CFClient::OpenGL;
1765 1906
1766sub key_down { 1907sub invoke_key_down {
1767 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1768 1909
1769 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1770 1911
1771 if ($sym == 13) { 1912 if ($sym == 13) {
1772 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1773 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1774 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1775 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1776 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1777 $self->update; 1919 $self->update;
1778 1920
1779 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1780 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1781 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1797 } else { 1939 } else {
1798 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1799 } 1941 }
1800 1942
1801 } else { 1943 } else {
1802 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1803 } 1947 1
1804
1805} 1948}
1806 1949
1807############################################################################# 1950#############################################################################
1808 1951
1809package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1818 1961
1819sub new { 1962sub new {
1820 my $class = shift; 1963 my $class = shift;
1821 1964
1822 $class->SUPER::new ( 1965 $class->SUPER::new (
1823 padding => 4, 1966 padding_x => 4,
1967 padding_y => 4,
1824 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1825 active_fg => [0, 0, 1], 1969 active_fg => [0, 0, 1],
1826 can_hover => 1, 1970 can_hover => 1,
1827 align => 0, 1971 align => 0,
1828 valign => 0, 1972 valign => 0,
1829 can_events => 1, 1973 can_events => 1,
1830 @_ 1974 @_
1831 ) 1975 )
1832} 1976}
1833 1977
1834sub activate { }
1835
1836sub button_up { 1978sub invoke_button_up {
1837 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1838 1980
1839 $self->emit ("activate") 1981 $self->emit ("activate")
1840 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1841 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
1984
1985 1
1842} 1986}
1843 1987
1844sub _draw { 1988sub _draw {
1845 my ($self) = @_; 1989 my ($self) = @_;
1846 1990
1847 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1848
1849 if ($GRAB == $self) {
1850 $self->{fg} = $self->{active_fg};
1851 }
1852 1992
1853 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1855 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1856 1996
… …
1861 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1862} 2002}
1863 2003
1864############################################################################# 2004#############################################################################
1865 2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
2038}
2039
2040#############################################################################
2041
1866package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
1867 2043
1868our @ISA = CFClient::UI::DrawBG::; 2044our @ISA = CFClient::UI::DrawBG::;
1869 2045
1870my @tex = 2046my @tex =
… …
1875 2051
1876sub new { 2052sub new {
1877 my $class = shift; 2053 my $class = shift;
1878 2054
1879 $class->SUPER::new ( 2055 $class->SUPER::new (
1880 padding => 2, 2056 padding_x => 2,
2057 padding_y => 2,
1881 fg => [1, 1, 1], 2058 fg => [1, 1, 1],
1882 active_fg => [1, 1, 0], 2059 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2], 2060 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5], 2061 active_bg => [1, 1, 1, 0.5],
1885 state => 0, 2062 state => 0,
… …
1889} 2066}
1890 2067
1891sub size_request { 2068sub size_request {
1892 my ($self) = @_; 2069 my ($self) = @_;
1893 2070
1894 ($self->{padding} * 2 + 6) x 2 2071 (6) x 2
1895} 2072}
1896 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1897sub button_down { 2082sub invoke_button_down {
1898 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1899 2084
1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1902 $self->{state} = !$self->{state}; 2087 $self->toggle;
1903 $self->_emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1904 } 2092 1
1905} 2093}
1906 2094
1907sub _draw { 2095sub _draw {
1908 my ($self) = @_; 2096 my ($self) = @_;
1909 2097
1910 $self->SUPER::_draw; 2098 $self->SUPER::_draw;
1911 2099
1912 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1913 2101
1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2102 my ($w, $h) = @$self{qw(w h)};
2103
2104 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1915 2105
1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1917 2107
1918 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919 2109
… …
1927package CFClient::UI::Image; 2117package CFClient::UI::Image;
1928 2118
1929our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1930 2120
1931use CFClient::OpenGL; 2121use CFClient::OpenGL;
1932use Carp qw/confess/;
1933 2122
1934our %loaded_images; 2123our %texture_cache;
1935 2124
1936sub new { 2125sub new {
1937 my $class = shift; 2126 my $class = shift;
1938 2127
1939 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1940 2132
1941 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
1942 2135
1943 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1944 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1945 2138
1946 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1947 2140
1948 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1949
1950 $self->{aspect} = $tex->{w} / $tex->{h};
1951 2142
1952 $self 2143 $self
1953} 2144}
1954 2145
1955sub size_request { 2146sub size_request {
1956 my ($self) = @_; 2147 my ($self) = @_;
1957 2148
1958 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1959} 2150}
1960 2151
1961sub _draw { 2152sub _draw {
1962 my ($self) = @_; 2153 my ($self) = @_;
1963 2154
… …
2072 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2073 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2074 2265
2075 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2076 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2077 2271
2078 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2080 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2082 2277
2083 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2084 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2099 2294
2100 if ($t3) { 2295 if ($t3) {
2101 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2102 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2103 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2104 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2105 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2106 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2107 glEnd; 2302 glEnd;
2108 } 2303 }
2109 2304
2110 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2184 fg => [1, 1, 1], 2379 fg => [1, 1, 1],
2185 active_fg => [0, 0, 0], 2380 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2], 2381 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5], 2382 active_bg => [1, 1, 1, 0.5],
2188 range => [0, 0, 100, 10, 0], 2383 range => [0, 0, 100, 10, 0],
2189 req_w => $::WIDTH / 80, 2384 min_w => $::WIDTH / 80,
2190 req_h => $::WIDTH / 80, 2385 min_h => $::WIDTH / 80,
2191 vertical => 0, 2386 vertical => 0,
2192 can_hover => 1, 2387 can_hover => 1,
2193 inner_pad => 0.02, 2388 inner_pad => 0.02,
2194 @_ 2389 @_
2195 ); 2390 );
… …
2203sub set_range { 2398sub set_range {
2204 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2205 2400
2206 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2207 2402
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2210} 2407}
2211 2408
2212sub set_value { 2409sub set_value {
2213 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2214 2411
… …
2225 if $unit; 2422 if $unit;
2226 2423
2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2228 2425
2229 if ($value != $old_value) { 2426 if ($value != $old_value) {
2230 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2231 $self->update; 2428 $self->update;
2232 } 2429 }
2233} 2430}
2234 2431
2235sub size_request { 2432sub size_request {
2236 my ($self) = @_; 2433 my ($self) = @_;
2237 2434
2238 my $w = $self->{req_w}; 2435 ($self->{req_w}, $self->{req_h})
2239 my $h = $self->{req_h};
2240
2241 $self->{vertical} ? ($h, $w) : ($w, $h)
2242} 2436}
2243 2437
2244sub button_down { 2438sub invoke_button_down {
2245 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2246 2440
2247 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2248 2442
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250 2444
2251 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2252} 2446}
2253 2447
2254sub mouse_motion { 2448sub invoke_mouse_motion {
2255 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2256 2450
2257 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2259 2453
2260 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261 2455
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263 2457
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2458 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459 } else {
2460 return 0;
2461 }
2462
2265 } 2463 1
2266} 2464}
2267 2465
2268sub update { 2466sub update {
2269 my ($self) = @_; 2467 my ($self) = @_;
2270 2468
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2469 delete $self->{knob_w};
2470 $self->SUPER::update;
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 unless ($self->{knob_w}) {
2272 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2273 2478
2274 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2276 2481
… …
2282 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2283 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2284 2489
2285 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2286 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2287 }); 2492 }
2288
2289 $self->SUPER::update;
2290}
2291
2292sub _draw {
2293 my ($self) = @_;
2294 2493
2295 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2296 2495
2297 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2298 2497
… …
2359sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2361 2560
2362############################################################################# 2561#############################################################################
2363 2562
2364package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2365 2564
2366our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2367 2566
2368use CFClient::OpenGL; 2567use CFClient::OpenGL;
2369 2568
… …
2371 my $class = shift; 2570 my $class = shift;
2372 2571
2373 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2374 fontsize => 1, 2573 fontsize => 1,
2375 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2376 #font => default_font 2576 #font => default_font
2377 @_, 2577 @_,
2378 2578
2379 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2380 par => [], 2580 par => [],
2381 height => 0, 2581 height => 0,
2382 children => [ 2582 children => [
2383 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2384 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2395 2595
2396 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2397 $self->reflow; 2597 $self->reflow;
2398} 2598}
2399 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2400sub size_allocate { 2609sub invoke_size_allocate {
2401 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2402 2611
2403 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2404 2614
2405 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2408 2619
2409 $self->reflow; 2620 $self->reflow;
2410}
2411 2621
2412sub text_size { 2622 local $self->{children} = [$empty, $slider];
2413 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2414 2628
2415 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2416 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2419 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2420 2642 );
2643
2421 $layout->size 2644 $layout
2422} 2645}
2423 2646
2424sub reflow { 2647sub reflow {
2425 my ($self) = @_; 2648 my ($self) = @_;
2426 2649
… …
2435 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2436} 2659}
2437 2660
2438sub clear { 2661sub clear {
2439 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2440 2666
2441 $self->{par} = []; 2667 $self->{par} = [];
2442 $self->{height} = 0; 2668 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444} 2670}
2445 2671
2446sub add_paragraph { 2672sub add_paragraph {
2447 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2448 2674
2449 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2450 my ($w, $h) = $self->text_size ($line); 2676
2451 $self->{height} += $h; 2677 $para = {
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2453 } 2684 };
2454 2685
2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2456} 2698}
2457 2699
2458sub update { 2700sub update {
2459 my ($self) = @_; 2701 my ($self) = @_;
2460 2702
… …
2462 2704
2463 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2464 2706
2465 delete $self->{texture}; 2707 delete $self->{texture};
2466 2708
2467 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469 2711
2470 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2471 my $height = 0; 2713 my $height = 0;
2472 2714
2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2477 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2479 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3]; 2719
2483 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2484 } 2723 }
2485 2724
2486 $height += $_->[1]; 2725 $height += $para->{h};
2487 } 2726 }
2488 2727
2489 $self->{height} = $height; 2728 $self->{height} = $height;
2490 2729
2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2492 2731
2493 delete $self->{texture}; 2732 delete $self->{texture};
2494 } 2733 }
2495 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2497 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2498 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2499 2742
2500 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2501 2744
2502 my $y0 = $top; 2745 my $y0 = $top;
2503 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2504 2747
2505 my $y = 0; 2748 my $y = 0;
2506 2749
2507 my $layout = $self->{layout};
2508
2509 $layout->set_font ($self->{font}) if $self->{font};
2510
2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2514
2515 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2516 my $h = $par->[1]; 2751 my $h = $para->{h};
2517 2752
2518 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]);
2521 $layout->set_markup ($par->[4]);
2522 2754
2523 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2524 2756
2525 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2527 } 2771 }
2528 2772
2529 $y += $h; 2773 $y += $h;
2530 } 2774 }
2531
2532 glDisable GL_BLEND;
2533 }; 2775 };
2534 }); 2776 });
2535} 2777}
2536 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2537sub _draw { 2788sub _draw {
2538 my ($self) = @_; 2789 my ($self) = @_;
2539 2790
2540 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2542 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2544 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2545 2796
2546 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2547
2548} 2798}
2549 2799
2550############################################################################# 2800#############################################################################
2551 2801
2552package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2631} 2881}
2632 2882
2633sub set_tooltip_from { 2883sub set_tooltip_from {
2634 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2635 2885
2886 my $tooltip = $widget->{tooltip};
2887
2888 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891 . "req $widget->{req_w} $widget->{req_h}\n"
2892 . "visible $widget->{visible}";
2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2897
2636 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8, 2901 fontsize => 0.8,
2640 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2641 ellipsise => 0, 2903 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2650 2912
2651 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2652} 2914}
2653 2915
2654sub size_allocate { 2916sub invoke_size_allocate {
2655 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2656 2918
2657 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2920}
2921
2922sub invoke_visibility_change {
2923 my ($self, $visible) = @_;
2924
2925 return unless $visible;
2926
2927 $self->{root}->on_post_alloc ("move_$self" => sub {
2928 my $widget = $self->{owner}
2929 or return;
2930
2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2932
2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2934 if $x + $self->{w} > $self->{root}{w};
2935
2936 $self->move_abs ($x, $y);
2937 });
2658} 2938}
2659 2939
2660sub _draw { 2940sub _draw {
2661 my ($self) = @_; 2941 my ($self) = @_;
2662 2942
… …
2679 glVertex $w, $h; 2959 glVertex $w, $h;
2680 glVertex $w, 0; 2960 glVertex $w, 0;
2681 glEnd; 2961 glEnd;
2682 2962
2683 glTranslate 2 - 0.375, 2 - 0.375; 2963 glTranslate 2 - 0.375, 2 - 0.375;
2964
2684 $self->SUPER::_draw; 2965 $self->SUPER::_draw;
2685} 2966}
2686 2967
2687############################################################################# 2968#############################################################################
2688 2969
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 3029
2749 if ($tex) { 3030 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2755 } 3036 }
2756} 3037}
2757 3038
2758sub DESTROY { 3039sub destroy {
2759 my ($self) = @_; 3040 my ($self) = @_;
2760 3041
2761 $self->{timer}->cancel 3042 $self->{timer}->cancel
2762 if $self->{timer}; 3043 if $self->{timer};
2763 3044
2764 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2765} 3046}
2766 3047
2767############################################################################# 3048#############################################################################
2768 3049
2769package CFClient::UI::Inventory; 3050package CFClient::UI::Buttonbar;
2770 3051
2771our @ISA = CFClient::UI::ScrolledWindow::; 3052our @ISA = CFClient::UI::HBox::;
2772 3053
2773sub new { 3054# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808
2809sub size_request {
2810 my ($self) = @_;
2811 ($self->{req_w}, $self->{req_h});
2812}
2813 3055
2814############################################################################# 3056#############################################################################
2815 3057
2816package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2817 3059
… …
2829 ); 3071 );
2830 3072
2831 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2832 3074
2833 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2834 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2835 3077
2836 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2837 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2838 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2839 can_hover => 1, 3095 can_hover => 1,
2840 can_events => 1, 3096 can_events => 1,
2841 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2842 } 3100 }
2843 3101
2844 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2845 3103
2846 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2851 3109
2852# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2853sub popup { 3111sub popup {
2854 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2855 3113
2856 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2857 3115
2858 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2859 $GRAB = $self; 3117 $GRAB = $self;
2860 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2861 3119
2862 $self->show; 3120 $self->show;
2863 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2864} 3122}
2865 3123
2866sub mouse_motion { 3124sub invoke_mouse_motion {
2867 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2868 3126
2869 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2870 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2871 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2872}
2873 3130
3131 0
3132}
3133
2874sub button_up { 3134sub invoke_button_up {
2875 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2876 3136
2877 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2878 undef $GRAB; 3138 undef $GRAB;
2879 $self->hide; 3139 $self->hide;
2880 3140
2881 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2882 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2883 } 3147 1
2884} 3148}
2885 3149
2886############################################################################# 3150#############################################################################
2887 3151
2888package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2889 3153
2890our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2891 3155
2892sub new { 3156sub new {
2893 my $class = shift; 3157 my $class = shift;
2894 3158
2895 $class->SUPER::new ( 3159 my $self = $class->SUPER::new (
3160 @_,
3161 );
3162
3163 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} };
3165
3166 $self
3167}
3168
3169sub add {
3170 my ($self, @widgets) = @_;
3171
3172 $self->SUPER::add (@widgets);
3173
3174 $self->{current} = $self->{children}[0]
3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3184sub set_current_page {
3185 my ($self, $page_or_widget) = @_;
3186
3187 my $widget = ref $page_or_widget
3188 ? $page_or_widget
3189 : $self->{children}[$page_or_widget];
3190
3191 $self->{current} = $widget;
3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3193
3194 $self->emit (page_changed => $self->{current});
3195
3196 $self->realloc;
3197}
3198
3199sub visible_children {
3200 $_[0]{current}
3201}
3202
3203sub size_request {
3204 my ($self) = @_;
3205
3206 $self->{current}->size_request
3207}
3208
3209sub invoke_size_allocate {
3210 my ($self, $w, $h) = @_;
3211
3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3215}
3216
3217sub _draw {
3218 my ($self) = @_;
3219
3220 $self->{current}->draw;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Notebook;
3226
3227our @ISA = CFClient::UI::VBox::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self
3236 @_,
3237 );
3238
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241
3242 $self
3243}
3244
3245sub add {
3246 my ($self, $title, $widget, $tooltip) = @_;
3247
3248 Scalar::Util::weaken $self;
3249
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3265sub set_current_page {
3266 my ($self, $page) = @_;
3267
3268 $self->{multiplexer}->set_current_page ($page);
3269 $self->emit (page_changed => $self->{multiplexer}{current});
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Combobox;
3275
3276use utf8;
3277
3278our @ISA = CFClient::UI::Button::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
2896 fontsize => 0.8, 3338 fontsize => 0.8,
2897 @_, 3339 @_,
2898 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
2899} 3347}
2900 3348
2901sub reorder { 3349sub reorder {
2902 my ($self) = @_; 3350 my ($self) = @_;
2903 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
2904 3357
2905 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 } 3360 }
2908 3361
… …
2911 my @items = sort { 3364 my @items = sort {
2912 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2915 3368
3369 $self->{timer}->interval (1);
3370
2916 my $count = 10 + 1; 3371 my $count = 10 + 1;
2917 for my $item (@items) { 3372 for my $item (@items) {
2918 last unless --$count; 3373 last unless --$count;
2919 3374
2920 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text}; 3379 : $item->{text};
2925 3380
… …
2933 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2939 can_events => 1, 3394 can_events => 1,
2940 can_hover => 1 3395 can_hover => 1
2941 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
2942 } 3409 }
2943 3410
2944 $self->clear; 3411 $self->clear;
2945 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2946} 3413}
… …
2951 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2953 3420
2954 return unless $text; 3421 return unless $text;
2955 3422
2956 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2957 3424
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959 3426
2960 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2962 $item->{count}++; 3429 $item->{count}++;
2963 } else { 3430 } else {
2964 $item->{count} = 1; 3431 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2966 } 3433 }
2967 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
2968 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
2969 delete $item->{label}; 3436 delete $item->{label};
2970 } else { 3437 } else {
2971 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
2972 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
2978 count => 1, 3445 count => 1,
2979 %arg, 3446 %arg,
2980 }; 3447 };
2981 } 3448 }
2982 3449
3450 $ROOT->on_refresh (reorder => sub {
2983 $self->reorder; 3451 $self->reorder;
3452 });
2984} 3453}
2985 3454
2986sub reconfigure { 3455sub reconfigure {
2987 my ($self) = @_; 3456 my ($self) = @_;
2988 3457
… …
2991 3460
2992 $self->reorder; 3461 $self->reorder;
2993 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
2994} 3463}
2995 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
2996############################################################################# 3473#############################################################################
2997 3474
2998package CFClient::UI::Root; 3475package CFClient::UI::Inventory;
2999 3476
3000our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Table::;
3001
3002use CFClient::OpenGL;
3003 3478
3004sub new { 3479sub new {
3005 my $class = shift; 3480 my $class = shift;
3006 3481
3007 $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0],
3484 @_,
3485 );
3486
3487 $self
3488}
3489
3490sub set_items {
3491 my ($self, $items) = @_;
3492
3493 $self->clear;
3494 return unless $items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::SpellList;
3518
3519our @ISA = CFClient::UI::Table::;
3520
3521sub new {
3522 my $class = shift;
3523
3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3527 @_,
3528 )
3529}
3530
3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3616sub add_spell {
3617 my ($self, $spell) = @_;
3618
3619 $self->{spell}->{$spell->{name}} = $spell;
3620 $self->rebuild_spell_list;
3621}
3622
3623sub remove_spell {
3624 my ($self, $spell) = @_;
3625
3626 delete $self->{spell}->{$spell->{name}};
3627 $self->rebuild_spell_list;
3628}
3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3637#############################################################################
3638
3639package CFClient::UI::Root;
3640
3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3644
3645use CFClient::OpenGL;
3646
3647sub new {
3648 my $class = shift;
3649
3650 my $self = $class->SUPER::new (
3008 visible => 1, 3651 visible => 1,
3009 @_, 3652 @_,
3010 ) 3653 );
3011}
3012 3654
3013sub configure { 3655 Scalar::Util::weaken ($self->{root} = $self);
3014 my ($self, $x, $y, $w, $h) = @_;
3015 3656
3016 $self->{w} = $w; 3657 $self
3017 $self->{h} = $h;
3018}
3019
3020sub check_size {
3021 my ($self) = @_;
3022
3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
3025} 3658}
3026 3659
3027sub size_request { 3660sub size_request {
3028 my ($self) = @_; 3661 my ($self) = @_;
3029 3662
3030 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
3031} 3664}
3032 3665
3666sub _to_pixel {
3667 my ($coord, $size, $max) = @_;
3668
3669 $coord =
3670 $coord eq "center" ? ($max - $size) * 0.5
3671 : $coord eq "max" ? $max
3672 : $coord;
3673
3674 $coord = 0 if $coord < 0;
3675 $coord = $max - $size if $coord > $max - $size;
3676
3677 int $coord + 0.5
3678}
3679
3033sub size_allocate { 3680sub invoke_size_allocate {
3034 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3035 3682
3036 for my $child ($self->children) { 3683 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3685
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3686 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3687 $Y = $child->{force_y} if exists $child->{force_y};
3041 3688
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3689 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3691
3051 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3052 } 3693 }
3694
3695 1
3053} 3696}
3054 3697
3055sub coord2local { 3698sub coord2local {
3056 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3057 3700
… …
3065} 3708}
3066 3709
3067sub update { 3710sub update {
3068 my ($self) = @_; 3711 my ($self) = @_;
3069 3712
3070 $self->check_size;
3071 $::WANT_REFRESH++; 3713 $::WANT_REFRESH++;
3072} 3714}
3073 3715
3074sub add { 3716sub add {
3075 my ($self, @children) = @_; 3717 my ($self, @children) = @_;
3076 3718
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1; 3719 $_->{is_toplevel} = 1
3085 3720 for @children;
3086 # integerise window positions
3087 $child->{x} = int $child->{x};
3088 $child->{y} = int $child->{y};
3089 }
3090 3721
3091 $self->SUPER::add (@children); 3722 $self->SUPER::add (@children);
3092} 3723}
3093 3724
3094sub remove { 3725sub remove {
3095 my ($self, @children) = @_; 3726 my ($self, @children) = @_;
3096 3727
3097 $self->SUPER::remove (@children); 3728 $self->SUPER::remove (@children);
3729
3730 delete $self->{is_toplevel}
3731 for @children;
3098 3732
3099 while (@children) { 3733 while (@children) {
3100 my $w = pop @children; 3734 my $w = pop @children;
3101 push @children, $w->children; 3735 push @children, $w->children;
3102 $w->set_invisible; 3736 $w->set_invisible;
… …
3121 while ($self->{refresh_hook}) { 3755 while ($self->{refresh_hook}) {
3122 $_->() 3756 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
3124 } 3758 }
3125 3759
3126 if ($self->{check_size}) { 3760 if ($self->{realloc}) {
3761 my %queue;
3127 my @queue; 3762 my @queue;
3763 my $widget;
3128 3764
3129 for (;;) { 3765 outer:
3130 if ($self->{check_size}) { 3766 while () {
3131 #TODO use array-of-depth approach 3767 if (my $realloc = delete $self->{realloc}) {
3768 for $widget (values %$realloc) {
3769 $widget->{visible} or next; # do not resize invisible widgets
3132 3770
3133 @queue = sort { $a->{visible} <=> $b->{visible} } 3771 $queue{$widget+0}++ and next; # duplicates are common
3134 @queue, values %{delete $self->{check_size}}; 3772
3773 push @{ $queue[$widget->{visible}] }, $widget;
3774 }
3135 } 3775 }
3136 3776
3777 while () {
3778 @queue or last outer;
3779
3137 my $widget = pop @queue || last; 3780 $widget = pop @{ $queue[-1] || [] }
3138 3781 and last;
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148 3782
3783 pop @queue;
3784 }
3785
3786 delete $queue{$widget+0};
3787
3788 my ($w, $h) = $widget->size_request;
3789
3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3795
3796 $w = $widget->{force_w} if exists $widget->{force_w};
3797 $h = $widget->{force_h} if exists $widget->{force_h};
3798
3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3800 || delete $widget->{force_realloc}) {
3149 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
3151 3803
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3804 $self->{size_alloc}{$widget+0} = $widget;
3153 3805
3154 $widget->{parent}->check_size
3155 if $widget->{parent}; 3806 if (my $parent = $widget->{parent}) {
3807 $self->{realloc}{$parent+0} = $parent
3808 unless $queue{$parent+0};
3809
3810 $parent->{force_size_alloc} = 1;
3811 $self->{size_alloc}{$parent+0} = $parent;
3812 }
3156 } 3813 }
3814
3815 delete $self->{realloc}{$widget+0};
3157 } 3816 }
3158 } 3817 }
3159 3818
3160 while ($self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) { 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
3162 my ($widget, $w, $h) = @$_; 3821 values %$size_alloc;
3822
3823 while () {
3824 my $widget = pop @queue || last;
3825
3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3163 3827
3164 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3166 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
3837 $w = int $w + 0.5;
3838 $h = int $h + 0.5;
3839
3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h};
3843
3167 $widget->{w} = $w; 3844 $widget->{w} = $w;
3168 $widget->{h} = $h; 3845 $widget->{h} = $h;
3846
3169 $widget->emit (size_allocate => $w, $h); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
3170 } 3849 }
3171 } 3850 }
3172 3851
3173 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3174 $_->() 3853 $_->()
3175 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3176 } 3855 }
3856
3177 3857
3178 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3180 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3181 3861
… …
3183 glLoadIdentity; 3863 glLoadIdentity;
3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3185 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3186 glLoadIdentity; 3866 glLoadIdentity;
3187 3867
3868 {
3869 package CFClient::UI::Base;
3870
3871 ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h});
3873 }
3874
3188 $self->_draw; 3875 $self->_draw;
3189} 3876}
3190 3877
3191############################################################################# 3878#############################################################################
3192 3879

Diff Legend

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