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.240 by root, Fri May 26 18:28:23 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
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
233 276
234 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
235 279
236 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
238 282
239 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
241 285
242 $self->focus_out; 286 $self->emit ("focus_out");
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;
243} 305}
244 306
245sub hide { 307sub hide {
246 my ($self) = @_; 308 my ($self) = @_;
247 309
… …
249 311
250 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
251 if $self->{parent}; 313 if $self->{parent};
252} 314}
253 315
254sub move { 316sub move_abs {
255 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
256 318
257 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
258 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
259 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
260 322
261 $self->update; 323 $self->update;
262} 324}
263 325
264sub set_size { 326sub set_size {
265 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
266 328
267 $self->{user_w} = $w; 329 $self->{force_w} = $w;
268 $self->{user_h} = $h; 330 $self->{force_h} = $h;
269 331
270 $self->check_size; 332 $self->realloc;
271} 333}
272 334
273sub size_request { 335sub size_request {
274 require Carp; 336 require Carp;
275 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
276} 338}
277 339
340sub baseline_shift {
341 0
342}
343
278sub configure { 344sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
280 346
281 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
284 352
285 # use alignment to adjust x, y 353 # use alignment to adjust x, y
286 354
287 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 357 }
292 358
293 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 360 $self->{x} = $x;
295 $self->{y} = $y; 361 $self->{y} = $y;
296 $self->update; 362 $self->update;
297 } 363 }
298 364
299 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
301 }
302}
303 367
304sub size_allocate { 368 $self->{alloc_w} = $w;
305 # nothing to be done 369 $self->{alloc_h} = $h;
306}
307 370
308sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
309 my ($self) = @_; 372 }
310
311 $self->check_size (1);
312 $self->update;
313} 373}
314 374
315sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
316} 381}
317 382
318sub set_max_size { 383sub set_max_size {
319 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
320 385
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
323} 390}
324 391
325sub set_tooltip { 392sub set_tooltip {
326 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
327 394
… …
332 399
333 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
334 401
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
338 } 405 }
339} 406}
340 407
341# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
342sub coord2local { 409sub coord2local {
… …
350 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
351 418
352 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
353} 420}
354 421
355sub focus_in { 422sub invoke_focus_in {
356 my ($self) = @_; 423 my ($self) = @_;
357 424
358 return if $FOCUS == $self; 425 return if $FOCUS == $self;
359 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
360 427
361 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
362 429
363 $self->_emit (focus_in => $focus); 430 $self->update;
364 431
365 $focus->update if $focus; 432 0
366 $FOCUS->update;
367} 433}
368 434
369sub focus_out { 435sub invoke_focus_out {
370 my ($self) = @_; 436 my ($self) = @_;
371 437
372 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
373 439
374 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
375 441
376 $self->_emit (focus_out => $focus); 442 $self->update;
377 443
378 $focus->update if $focus; #?
379
380 $::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
381 unless $FOCUS; 445 unless $FOCUS;
382}
383 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
384sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
385sub button_up { } 458sub invoke_button_up { 0 }
386sub key_down { } 459sub invoke_key_down { 0 }
387sub key_up { } 460sub invoke_key_up { 0 }
388 461
389sub button_down { 462sub invoke_button_down {
390 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
391 464
392 $self->focus_in; 465 $self->grab_focus;
393}
394 466
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
399sub 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
400 537
401sub draw { 538sub draw {
402 my ($self) = @_; 539 my ($self) = @_;
403 540
404 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);
405 550
406 glPushMatrix; 551 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 553
411 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 556 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 558 glBegin GL_QUADS;
418 glVertex $x , $y; 559 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
422 glEnd; 563 glEnd;
423 glDisable GL_BLEND; 564 glDisable GL_BLEND;
424 } 565 }
425 566
426 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 568 glPushMatrix;
428 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 572 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
435 glEnd; 576 glEnd;
436 glPopMatrix; 577 glPopMatrix;
437 #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;
438 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
439} 583}
440 584
441sub _draw { 585sub _draw {
442 my ($self) = @_; 586 my ($self) = @_;
443 587
444 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
445} 589}
446 590
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505}
506
507sub DESTROY { 591sub DESTROY {
508 my ($self) = @_; 592 my ($self) = @_;
509 593
594 return if CFClient::in_destruct;
595
510 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
511 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
512} 600}
513 601
514############################################################################# 602#############################################################################
515 603
516package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
541 629
542 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
544 632
545 glEnable GL_BLEND; 633 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 635 glColor_premultiply @$color;
548 636
549 glBegin GL_QUADS; 637 glBegin GL_QUADS;
550 glVertex 0 , 0; 638 glVertex 0 , 0;
551 glVertex 0 , $h; 639 glVertex 0 , $h;
552 glVertex $w, $h; 640 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 656 $class->SUPER::new (can_events => 0, %arg);
569} 657}
570 658
571sub size_request { 659sub size_request {
572 (0, 0) 660 my ($self) = @_;
661
662 ($self->{w} + 0, $self->{h} + 0)
573} 663}
574 664
575sub draw { } 665sub draw { }
576 666
577############################################################################# 667#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
582 672
583sub new { 673sub new {
584 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
585 675
586 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
587 677
588 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
589 children => [], 679 children => [],
590 can_events => 0, 680 can_events => 0,
591 %arg, 681 %arg,
592 ); 682 );
683
593 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
594 686
595 $self 687 $self
596} 688}
597 689
598sub add { 690sub add {
… …
606 $self->{children} = [ 698 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 699 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 700 @{$self->{children}}, @widgets
609 ]; 701 ];
610 702
611 $self->check_size (1); 703 $self->realloc;
612 $self->update;
613} 704}
614 705
615sub children { 706sub children {
616 @{ $_[0]{children} } 707 @{ $_[0]{children} }
617} 708}
… …
622 delete $child->{parent}; 713 delete $child->{parent};
623 $child->hide; 714 $child->hide;
624 715
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 716 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 717
627 $self->check_size (1); 718 $self->realloc;
628 $self->update;
629} 719}
630 720
631sub clear { 721sub clear {
632 my ($self) = @_; 722 my ($self) = @_;
633 723
… …
637 for (@$children) { 727 for (@$children) {
638 delete $_->{parent}; 728 delete $_->{parent};
639 $_->hide; 729 $_->hide;
640 } 730 }
641 731
642 $self->check_size; 732 $self->realloc;
643 $self->update;
644} 733}
645 734
646sub find_widget { 735sub find_widget {
647 my ($self, $x, $y) = @_; 736 my ($self, $x, $y) = @_;
648 737
649 $x -= $self->{x}; 738 $x -= $self->{x};
650 $y -= $self->{y}; 739 $y -= $self->{y};
651 740
652 my $res; 741 my $res;
653 742
654 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
656 and return $res; 745 and return $res;
657 } 746 }
658 747
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680} 769}
681 770
682sub add { 771sub add {
683 my ($self, $child) = @_; 772 my ($self, $child) = @_;
684 773
685 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
686
687 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
688} 776}
689 777
690sub remove { 778sub remove {
691 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
700 788
701sub size_request { 789sub size_request {
702 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
703} 791}
704 792
705sub size_allocate { 793sub invoke_size_allocate {
706 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
707 795
708 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
709} 799}
710 800
711############################################################################# 801#############################################################################
802
803# back-buffered drawing area
712 804
713package CFClient::UI::Window; 805package CFClient::UI::Window;
714 806
715our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
716 808
… …
727 819
728 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
729 $self->SUPER::update; 821 $self->SUPER::update;
730} 822}
731 823
732sub size_allocate { 824sub invoke_size_allocate {
733 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
734 826
735 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
737} 830}
738 831
739sub _render { 832sub _render {
833 my ($self) = @_;
834
740 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
741} 836}
742 837
743sub render_child { 838sub render_child {
744 my ($self) = @_; 839 my ($self) = @_;
745 840
746 $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 {
747 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
749 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
750 $self->_render; 852 $self->_render;
751 }; 853 };
752} 854}
753 855
754sub _draw { 856sub _draw {
755 my ($self) = @_; 857 my ($self) = @_;
756 858
757 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
758 860
759 my $tex = $self->{texture} 861 my $tex = $self->{texture}
760 or return; 862 or return;
761 863
762 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
765 867
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 869
768 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
769} 871}
… …
785} 887}
786 888
787sub size_request { 889sub size_request {
788 my ($self) = @_; 890 my ($self) = @_;
789 891
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 893
792 @$self{qw(child_w child_h)} 894 $w = 10 if $self->{scroll_x};
793} 895 $h = 10 if $self->{scroll_y};
794 896
897 ($w, $h)
898}
899
795sub size_allocate { 900sub invoke_size_allocate {
796 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
797 902
903 my $child = $self->child;
904
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 907
801 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
802 $self->update; 909 $self->update;
910
911 1
803} 912}
804 913
805sub set_offset { 914sub set_offset {
806 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
807 916
… …
840} 949}
841 950
842sub _render { 951sub _render {
843 my ($self) = @_; 952 my ($self) = @_;
844 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
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 958
847 $self->SUPER::_render; 959 $self->SUPER::_render;
848} 960}
849 961
… …
852package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
853 965
854our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
855 967
856sub new { 968sub new {
857 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
858 972
859 my $self; 973 my $self;
860 974
861 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
862 vertical => 1, 976 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 977 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 978 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 979 $self->{vp}->set_offset (0, $_[1]);
866 }, 980 },
867 ; 981 ;
868 982
869 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 985 slider => $slider,
872 @_, 986 %arg,
873 ); 987 );
874 988
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
878 991
879 $self 992 $self
880} 993}
881 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
882sub update { 1017sub update {
883 my ($self) = @_; 1018 my ($self) = @_;
884 1019
885 $self->SUPER::update; 1020 $self->SUPER::update;
886 1021
887 # todo: overwrite size_allocate of child 1022 $self->update_slider;
888 my $child = $self->{vp}->child;
889 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
890} 1023}
891 1024
892sub size_allocate { 1025sub invoke_size_allocate {
893 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
894 1027
1028 $self->update_slider;
1029
895 $self->SUPER::size_allocate ($w, $h); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
896
897 my $child = $self->{vp}->child;
898 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
899} 1031}
900
901#TODO# update range on size_allocate depending on child
902# update viewport offset on scroll
903 1032
904############################################################################# 1033#############################################################################
905 1034
906package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
907 1036
… …
923 1052
924 if ($self->{bg}) { 1053 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
926 1055
927 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
930 1059
931 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
932 glVertex 0 , 0; 1061 glVertex 0 , 0;
933 glVertex 0 , $h; 1062 glVertex 0 , $h;
934 glVertex $w, $h; 1063 glVertex $w, $h;
… …
947 1076
948our @ISA = CFClient::UI::Bin::; 1077our @ISA = CFClient::UI::Bin::;
949 1078
950use CFClient::OpenGL; 1079use CFClient::OpenGL;
951 1080
952my @tex = 1081my $bg =
1082 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1083 mipmap => 1, wrap => 1;
1084
1085my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 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);
955 1088
956sub new { 1089sub new {
957 my $class = shift; 1090 my ($class, %arg) = @_;
958
959 # TODO: user_x, user_y, overwrite moveto?
960 1091
961 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1095 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1096 can_events => 1,
967 @_ 1097 min_w => 64,
1098 min_h => 32,
1099 %arg,
968 ); 1100 );
969 1101
970 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
971 align => 0, 1103 align => 0,
972 valign => 1, 1104 valign => 1,
973 text => $self->{title}, 1105 text => $self->{title},
974 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 }
975 1117
976 $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};
977} 1127}
978 1128
979sub border { 1129sub border {
980 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
981} 1131}
982 1132
983sub size_request { 1133sub size_request {
984 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};
985 1141
986 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
987 1143
988 ( 1144 (
989 $w + $self->border * 2, 1145 $w + $self->border * 2,
990 $h + $self->border * 2, 1146 $h + $self->border * 2,
991 ) 1147 )
992} 1148}
993 1149
994sub size_allocate { 1150sub invoke_size_allocate {
995 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
996 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
997 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
999 1163
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1004}
1005 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
1006sub button_down { 1180sub invoke_button_down {
1007 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1008 1182
1009 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1010 my $border = $self->border; 1184 my $border = $self->border;
1011 1185
… …
1024 my ($ev, $x, $y) = @_; 1198 my ($ev, $x, $y) = @_;
1025 1199
1026 my $dx = $ev->{x} - $ox; 1200 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1028 1202
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1205
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1207 $self->realloc;
1033 }; 1208 };
1034 1209
1035 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1214 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1041 1216
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1218
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
1047 } 1227 1
1048} 1228}
1049 1229
1050sub button_up { 1230sub invoke_button_up {
1051 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1052 1232
1053 delete $self->{motion}; 1233 ! ! delete $self->{motion}
1054} 1234}
1055 1235
1056sub mouse_motion { 1236sub invoke_mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1058 1238
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
1060} 1242}
1061 1243
1062sub _draw { 1244sub _draw {
1063 my ($self) = @_; 1245 my ($self) = @_;
1064 1246
1247 my $child = $self->{children}[0];
1248
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1251
1068 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1254
1071 my $border = $self->border; 1255 my $border = $self->border;
1072 1256
1073 glColor @{ $self->{border_bg} }; 1257 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1258 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1259 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1260 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1261 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1262
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1263 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1264 glColor @{ $self->{bg} };
1081 1265
1082 # TODO: repeat texture not scale 1266 # TODO: repeat texture not scale
1267 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1268 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1269 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1271 }
1093 1272
1094 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1095 1274
1096 $self->{title}->draw if $self->{title};
1097
1098 $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};
1099} 1286}
1100 1287
1101############################################################################# 1288#############################################################################
1102 1289
1103package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1312 my ($self, $x, $y, $child) = @_;
1126 1313
1127 $child->set_parent ($self); 1314 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1129 1316
1130 $self->check_size (1); 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1131} 1324}
1132 1325
1133# 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?
1134sub clear { 1327sub clear {
1135 my ($self) = @_; 1328 my ($self) = @_;
… …
1140 for (@children) { 1333 for (@children) {
1141 delete $_->{parent}; 1334 delete $_->{parent};
1142 $_->hide; 1335 $_->hide;
1143 } 1336 }
1144 1337
1145 $self->check_size (1); 1338 $self->realloc;
1146 $self->update;
1147} 1339}
1148 1340
1149sub get_wh { 1341sub get_wh {
1150 my ($self) = @_; 1342 my ($self) = @_;
1151 1343
… …
1177 (sum @$ws), 1369 (sum @$ws),
1178 (sum @$hs), 1370 (sum @$hs),
1179 ) 1371 )
1180} 1372}
1181 1373
1182sub size_allocate { 1374sub invoke_size_allocate {
1183 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1184 1376
1185 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1186 1378
1187 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1219 } 1411 }
1220 1412
1221 $y += $row_h; 1413 $y += $row_h;
1222 } 1414 }
1223 1415
1416 1
1224} 1417}
1225 1418
1226sub find_widget { 1419sub find_widget {
1227 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1228 1421
… …
1247 } 1440 }
1248} 1441}
1249 1442
1250############################################################################# 1443#############################################################################
1251 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
1252package CFClient::UI::HBox; 1505package CFClient::UI::HBox;
1253 1506
1254# TODO: wrap into common Box base class
1255
1256our @ISA = CFClient::UI::Container::; 1507our @ISA = CFClient::UI::Box::;
1257 1508
1258sub size_request { 1509sub new {
1259 my ($self) = @_; 1510 my $class = shift;
1260 1511
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1512 $class->SUPER::new (
1262 1513 vertical => 0,
1263 ( 1514 @_,
1264 (List::Util::sum map $_->[0], @alloc),
1265 (List::Util::max map $_->[1], @alloc),
1266 ) 1515 )
1267} 1516}
1268 1517
1269sub size_allocate {
1270 my ($self, $w, $h) = @_;
1271
1272 ($h, $w) = ($w, $h);
1273
1274 my $children = $self->{children};
1275
1276 my @h = map $_->{req_w}, @$children;
1277
1278 my $req_h = List::Util::sum @h;
1279
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children;
1285 $exp ||= 1;
1286
1287 for (0 .. $#$children) {
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 }
1294 }
1295
1296 CFClient::UI::harmonize \@h;
1297
1298 my $y = 0;
1299 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_];
1302 $child->configure ($y, 0, $h, $w);
1303
1304 $y += $h;
1305 }
1306
1307 1
1308}
1309
1310############################################################################# 1518#############################################################################
1311 1519
1312package CFClient::UI::VBox; 1520package CFClient::UI::VBox;
1313 1521
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1522our @ISA = CFClient::UI::Box::;
1317 1523
1318sub size_request { 1524sub new {
1319 my ($self) = @_; 1525 my $class = shift;
1320 1526
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1527 $class->SUPER::new (
1322 1528 vertical => 1,
1323 ( 1529 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1530 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1531}
1367 1532
1368############################################################################# 1533#############################################################################
1369 1534
1370package CFClient::UI::Label; 1535package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1552 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1553 layout => (new CFClient::Layout),
1389 fontsize => 1, 1554 fontsize => 1,
1390 align => -1, 1555 align => -1,
1391 valign => -1, 1556 valign => -1,
1392 padding => 2, 1557 padding_x => 2,
1558 padding_y => 2,
1393 can_events => 0, 1559 can_events => 0,
1394 %arg 1560 %arg
1395 ); 1561 );
1396 1562
1397 if (exists $self->{template}) { 1563 if (exists $self->{template}) {
… …
1424 1590
1425 delete $self->{texture}; 1591 delete $self->{texture};
1426 $self->SUPER::update; 1592 $self->SUPER::update;
1427} 1593}
1428 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1429sub set_text { 1602sub set_text {
1430 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1431 1604
1432 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1434 1607
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1437 1609
1610 delete $self->{size_req};
1611 $self->realloc;
1438 $self->update; 1612 $self->update;
1439 $self->check_size;
1440} 1613}
1441 1614
1442sub set_markup { 1615sub set_markup {
1443 my ($self, $markup) = @_; 1616 my ($self, $markup) = @_;
1444 1617
1445 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1446 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1447 1620
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1622
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1452 1624
1625 delete $self->{size_req};
1626 $self->realloc;
1453 $self->update; 1627 $self->update;
1454 $self->check_size;
1455} 1628}
1456 1629
1457sub size_request { 1630sub size_request {
1458 my ($self) = @_; 1631 my ($self) = @_;
1459 1632
1633 $self->{size_req} ||= do {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1639
1466 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1467 1641
1468 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1469 $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);
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1646
1472 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1473 1648
1474 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1476 } 1654 };
1477 1655
1478 ( 1656 @{ $self->{size_req} }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1657}
1483 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1484sub size_allocate { 1663sub invoke_size_allocate {
1485 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1486 1665
1666 delete $self->{ox};
1667
1487 delete $self->{texture}; 1668 delete $self->{texture}
1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1488} 1672}
1489 1673
1490sub set_fontsize { 1674sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1492 1676
1493 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1494 delete $self->{texture}; 1679 delete $self->{texture};
1495 1680
1496 $self->update; 1681 $self->realloc;
1497 $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;
1498} 1691}
1499 1692
1500sub _draw { 1693sub _draw {
1501 my ($self) = @_; 1694 my ($self) = @_;
1502 1695
1503 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1504 1697
1505 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1506 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1508 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1705
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1514
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1517 : ($self->{w} - $tex->{w}) * 0.5);
1518
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1521 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1707 };
1525 1708
1526 glEnable GL_TEXTURE_2D; 1709 unless (exists $self->{ox}) {
1527 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);
1528 1713
1529 if ($tex->{format} == GL_ALPHA) { 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1530 glColor @{$self->{fg}}; 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1716 : ($self->{h} - $size->[1]) * 0.5);
1532 } else {
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 } 1717 };
1535 1718
1536 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});
1537} 1723}
1538 1724
1539############################################################################# 1725#############################################################################
1540 1726
1541package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1555 can_hover => 1, 1741 can_hover => 1,
1556 can_focus => 1, 1742 can_focus => 1,
1557 valign => 0, 1743 valign => 0,
1558 can_events => 1, 1744 can_events => 1,
1559 #text => ... 1745 #text => ...
1746 #hidden => "*",
1560 @_ 1747 @_
1561 ) 1748 )
1562} 1749}
1563 1750
1564sub _set_text { 1751sub _set_text {
… …
1566 1753
1567 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1568 1755
1569 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1570 1757
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1759 $self->{text} = $text;
1575 1760
1576 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1578 1764
1579 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1580} 1769}
1581 1770
1582sub set_text { 1771sub set_text {
1583 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1584 1773
1585 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1775 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1776}
1590 1777
1591sub get_text { 1778sub get_text {
1592 $_[0]{text} 1779 $_[0]{text}
1593} 1780}
… …
1598 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1599 1786
1600 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1601} 1788}
1602 1789
1603sub key_down { 1790sub invoke_key_down {
1604 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1605 1792
1606 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1607 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1608 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1620 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1621 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1622 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1623 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1812 $self->emit ('escape');
1626 } elsif ($uni) { 1813 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1628 } 1817 }
1629 1818
1630 $self->_set_text ($text); 1819 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633}
1634 1820
1821 $self->realloc;
1822
1823 1
1824}
1825
1635sub focus_in { 1826sub invoke_focus_in {
1636 my ($self) = @_; 1827 my ($self) = @_;
1637 1828
1638 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1639 1830
1640 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1641} 1832}
1642 1833
1643sub button_down { 1834sub invoke_button_down {
1644 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1645 1836
1646 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1647 1838
1648 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1649 1840
1650 # byte-index to char-index 1841 # byte-index to char-index
1651 my $text = $self->{text}; 1842 my $text = $self->{text};
1652 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1654 1845
1655 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1656 $self->update; 1847 $self->update;
1848
1849 1
1657} 1850}
1658 1851
1659sub mouse_motion { 1852sub invoke_mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1661# 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
1662} 1857}
1663 1858
1664sub _draw { 1859sub _draw {
1665 my ($self) = @_; 1860 my ($self) = @_;
1666 1861
1667 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1668 1863
1669 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1672 } else { 1867 } else {
1673 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1674 } 1869 }
1675 1870
1676 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1874 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1707 1902
1708our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1709 1904
1710use CFClient::OpenGL; 1905use CFClient::OpenGL;
1711 1906
1712sub key_down { 1907sub invoke_key_down {
1713 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1714 1909
1715 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1716 1911
1717 if ($sym == 13) { 1912 if ($sym == 13) {
1718 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1719 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1720 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1721 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1722 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1723 $self->update; 1919 $self->update;
1724 1920
1725 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1726 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1727 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1743 } else { 1939 } else {
1744 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1745 } 1941 }
1746 1942
1747 } else { 1943 } else {
1748 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1749 } 1947 1
1750
1751} 1948}
1752 1949
1753############################################################################# 1950#############################################################################
1754 1951
1755package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1764 1961
1765sub new { 1962sub new {
1766 my $class = shift; 1963 my $class = shift;
1767 1964
1768 $class->SUPER::new ( 1965 $class->SUPER::new (
1769 padding => 4, 1966 padding_x => 4,
1967 padding_y => 4,
1770 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1969 active_fg => [0, 0, 1],
1772 can_hover => 1, 1970 can_hover => 1,
1773 align => 0, 1971 align => 0,
1774 valign => 0, 1972 valign => 0,
1775 can_events => 1, 1973 can_events => 1,
1776 @_ 1974 @_
1777 ) 1975 )
1778} 1976}
1779 1977
1780sub activate { }
1781
1782sub button_up { 1978sub invoke_button_up {
1783 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1784 1980
1785 $self->emit ("activate") 1981 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
1984
1985 1
1788} 1986}
1789 1987
1790sub _draw { 1988sub _draw {
1791 my ($self) = @_; 1989 my ($self) = @_;
1792 1990
1793 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1992
1799 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1802 1996
… …
1807 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1808} 2002}
1809 2003
1810############################################################################# 2004#############################################################################
1811 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
1812package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
1813 2043
1814our @ISA = CFClient::UI::DrawBG::; 2044our @ISA = CFClient::UI::DrawBG::;
1815 2045
1816my @tex = 2046my @tex =
… …
1821 2051
1822sub new { 2052sub new {
1823 my $class = shift; 2053 my $class = shift;
1824 2054
1825 $class->SUPER::new ( 2055 $class->SUPER::new (
1826 padding => 2, 2056 padding_x => 2,
2057 padding_y => 2,
1827 fg => [1, 1, 1], 2058 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 2059 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 2060 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 2061 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 2062 state => 0,
… …
1835} 2066}
1836 2067
1837sub size_request { 2068sub size_request {
1838 my ($self) = @_; 2069 my ($self) = @_;
1839 2070
1840 ($self->{padding} * 2 + 6) x 2 2071 (6) x 2
1841} 2072}
1842 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1843sub button_down { 2082sub invoke_button_down {
1844 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1845 2084
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 2087 $self->toggle;
1849 $self->_emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1850 } 2092 1
1851} 2093}
1852 2094
1853sub _draw { 2095sub _draw {
1854 my ($self) = @_; 2096 my ($self) = @_;
1855 2097
1856 $self->SUPER::_draw; 2098 $self->SUPER::_draw;
1857 2099
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2100 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2101
1860 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;
1861 2105
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2106 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2107
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2108 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2109
… …
1873package CFClient::UI::Image; 2117package CFClient::UI::Image;
1874 2118
1875our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1876 2120
1877use CFClient::OpenGL; 2121use CFClient::OpenGL;
1878use Carp qw/confess/;
1879 2122
1880our %loaded_images; 2123our %texture_cache;
1881 2124
1882sub new { 2125sub new {
1883 my $class = shift; 2126 my $class = shift;
1884 2127
1885 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1886 2132
1887 $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";
1888 2135
1889 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1890 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;
1891 2138
1892 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1893 2140
1894 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1895
1896 $self->{aspect} = $tex->{w} / $tex->{h};
1897 2142
1898 $self 2143 $self
1899} 2144}
1900 2145
1901sub size_request { 2146sub size_request {
1902 my ($self) = @_; 2147 my ($self) = @_;
1903 2148
1904 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1905} 2150}
1906 2151
1907sub _draw { 2152sub _draw {
1908 my ($self) = @_; 2153 my ($self) = @_;
1909 2154
… …
2018 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2019 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2020 2265
2021 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2022 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);
2023 2271
2024 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2025 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;
2026 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2277
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2045 2294
2046 if ($t3) { 2295 if ($t3) {
2047 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2048 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2049 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2050 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2051 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2052 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2053 glEnd; 2302 glEnd;
2054 } 2303 }
2055 2304
2056 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2130 fg => [1, 1, 1], 2379 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2380 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2381 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2382 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2383 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2384 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2385 min_h => $::WIDTH / 80,
2137 vertical => 0, 2386 vertical => 0,
2138 can_hover => 1, 2387 can_hover => 1,
2139 inner_pad => 0.02, 2388 inner_pad => 0.02,
2140 @_ 2389 @_
2141 ); 2390 );
… …
2149sub set_range { 2398sub set_range {
2150 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2151 2400
2152 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2153 2402
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2156} 2407}
2157 2408
2158sub set_value { 2409sub set_value {
2159 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2160 2411
… …
2171 if $unit; 2422 if $unit;
2172 2423
2173 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2174 2425
2175 if ($value != $old_value) { 2426 if ($value != $old_value) {
2176 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2177 $self->update; 2428 $self->update;
2178 } 2429 }
2179} 2430}
2180 2431
2181sub size_request { 2432sub size_request {
2182 my ($self) = @_; 2433 my ($self) = @_;
2183 2434
2184 my $w = $self->{req_w}; 2435 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2436}
2189 2437
2190sub button_down { 2438sub invoke_button_down {
2191 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2192 2440
2193 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2194 2442
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2444
2197 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2198} 2446}
2199 2447
2200sub mouse_motion { 2448sub invoke_mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2202 2450
2203 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2204 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2205 2453
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2455
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2457
2210 $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
2211 } 2463 1
2212} 2464}
2213 2465
2214sub update { 2466sub update {
2215 my ($self) = @_; 2467 my ($self) = @_;
2216 2468
2217 $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}) {
2218 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2219 2478
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2222 2481
… …
2228 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2230 2489
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2233 }); 2492 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2493
2241 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2242 2495
2243 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2244 2497
… …
2305sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2306sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2307 2560
2308############################################################################# 2561#############################################################################
2309 2562
2310package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2311 2564
2312our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2313 2566
2314use CFClient::OpenGL; 2567use CFClient::OpenGL;
2315 2568
… …
2317 my $class = shift; 2570 my $class = shift;
2318 2571
2319 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2320 fontsize => 1, 2573 fontsize => 1,
2321 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2322 #font => default_font 2576 #font => default_font
2323 @_, 2577 @_,
2324 2578
2325 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2326 par => [], 2580 par => [],
2327 height => 0, 2581 height => 0,
2328 children => [ 2582 children => [
2329 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2330 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2341 2595
2342 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2343 $self->reflow; 2597 $self->reflow;
2344} 2598}
2345 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
2346sub size_allocate { 2609sub invoke_size_allocate {
2347 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2348 2611
2349 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2350 2614
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $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});
2354 2619
2355 $self->reflow; 2620 $self->reflow;
2356}
2357 2621
2358sub text_size { 2622 local $self->{children} = [$empty, $slider];
2359 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2360 2628
2361 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2362 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $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});
2365 $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}}
2366 2642 );
2643
2367 $layout->size 2644 $layout
2368} 2645}
2369 2646
2370sub reflow { 2647sub reflow {
2371 my ($self) = @_; 2648 my ($self) = @_;
2372 2649
… …
2381 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2382} 2659}
2383 2660
2384sub clear { 2661sub clear {
2385 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2386 2666
2387 $self->{par} = []; 2667 $self->{par} = [];
2388 $self->{height} = 0; 2668 $self->{height} = 0;
2389 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2390} 2670}
2391 2671
2392sub add_paragraph { 2672sub add_paragraph {
2393 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2394 2674
2395 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2396 my ($w, $h) = $self->text_size ($line); 2676
2397 $self->{height} += $h; 2677 $para = {
2398 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,
2399 } 2684 };
2400 2685
2401 $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;
2402} 2698}
2403 2699
2404sub update { 2700sub update {
2405 my ($self) = @_; 2701 my ($self) = @_;
2406 2702
… …
2408 2704
2409 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2410 2706
2411 delete $self->{texture}; 2707 delete $self->{texture};
2412 2708
2413 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415 2711
2416 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2417 my $height = 0; 2713 my $height = 0;
2418 2714
2419 my $layout = $self->{layout};
2420
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422
2423 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2425 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2426 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3]; 2719
2429 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2430 } 2723 }
2431 2724
2432 $height += $_->[1]; 2725 $height += $para->{h};
2433 } 2726 }
2434 2727
2435 $self->{height} = $height; 2728 $self->{height} = $height;
2436 2729
2437 $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]);
2438 2731
2439 delete $self->{texture}; 2732 delete $self->{texture};
2440 } 2733 }
2441 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2445 2742
2446 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2447 2744
2448 my $y0 = $top; 2745 my $y0 = $top;
2449 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2450 2747
2451 my $y = 0; 2748 my $y = 0;
2452 2749
2453 my $layout = $self->{layout};
2454
2455 $layout->set_font ($self->{font}) if $self->{font};
2456
2457 glEnable GL_BLEND;
2458 #TODO# not correct in windows where rgba is forced off
2459 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2460
2461 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2462 my $h = $par->[1]; 2751 my $h = $para->{h};
2463 2752
2464 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]);
2467 $layout->set_markup ($par->[4]);
2468 2754
2469 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2470 2756
2471 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2472 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 }
2473 } 2771 }
2474 2772
2475 $y += $h; 2773 $y += $h;
2476 } 2774 }
2477
2478 glDisable GL_BLEND;
2479 }; 2775 };
2480 }); 2776 });
2481} 2777}
2482 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2483sub _draw { 2788sub _draw {
2484 my ($self) = @_; 2789 my ($self) = @_;
2485 2790
2486 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2489 $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});
2490 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2491 2796
2492 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2493
2494} 2798}
2495 2799
2496############################################################################# 2800#############################################################################
2497 2801
2498package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2543 2847
2544sub new { 2848sub new {
2545 my $class = shift; 2849 my $class = shift;
2546 2850
2547 my $self = $class->SUPER::new ( 2851 my $self = $class->SUPER::new (
2548 state => 0, 2852 state => 0,
2549 connect_activate => \&toggle_flopper, 2853 on_activate => \&toggle_flopper,
2550 @_ 2854 @_
2551 ); 2855 );
2552 2856
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2857 $self
2559} 2858}
2560 2859
2561sub toggle_flopper { 2860sub toggle_flopper {
2562 my ($self) = @_; 2861 my ($self) = @_;
2563 2862
2564 # TODO: use animation 2863 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2864}
2576 2865
2577############################################################################# 2866#############################################################################
2578 2867
2579package CFClient::UI::Tooltip; 2868package CFClient::UI::Tooltip;
… …
2592} 2881}
2593 2882
2594sub set_tooltip_from { 2883sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2596 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
2597 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2901 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2903 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2610 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2611 2912
2612 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2613} 2914}
2614 2915
2615sub size_allocate { 2916sub invoke_size_allocate {
2616 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2617 2918
2618 $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 });
2619} 2938}
2620 2939
2621sub _draw { 2940sub _draw {
2622 my ($self) = @_; 2941 my ($self) = @_;
2623 2942
… …
2640 glVertex $w, $h; 2959 glVertex $w, $h;
2641 glVertex $w, 0; 2960 glVertex $w, 0;
2642 glEnd; 2961 glEnd;
2643 2962
2644 glTranslate 2 - 0.375, 2 - 0.375; 2963 glTranslate 2 - 0.375, 2 - 0.375;
2964
2645 $self->SUPER::_draw; 2965 $self->SUPER::_draw;
2646} 2966}
2647 2967
2648############################################################################# 2968#############################################################################
2649 2969
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 3029
2710 if ($tex) { 3030 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2716 } 3036 }
2717} 3037}
2718 3038
2719sub DESTROY { 3039sub destroy {
2720 my ($self) = @_; 3040 my ($self) = @_;
2721 3041
2722 $self->{timer}->cancel 3042 $self->{timer}->cancel
2723 if $self->{timer}; 3043 if $self->{timer};
2724 3044
2725 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2726} 3046}
2727 3047
2728############################################################################# 3048#############################################################################
2729 3049
2730package CFClient::UI::Inventory; 3050package CFClient::UI::Buttonbar;
2731 3051
2732our @ISA = CFClient::UI::ScrolledWindow::; 3052our @ISA = CFClient::UI::HBox::;
2733 3053
2734sub new { 3054# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 3055
2775############################################################################# 3056#############################################################################
2776 3057
2777package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2778 3059
… …
2790 ); 3071 );
2791 3072
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2793 3074
2794 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2796 3077
2797 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2798 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 {
2799 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2800 can_hover => 1, 3095 can_hover => 1,
2801 can_events => 1, 3096 can_events => 1,
2802 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2803 } 3100 }
2804 3101
2805 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2806 3103
2807 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2812 3109
2813# 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)
2814sub popup { 3111sub popup {
2815 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2816 3113
2817 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2818 3115
2819 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 3117 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2822 3119
2823 $self->show; 3120 $self->show;
2824 $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);
2825} 3122}
2826 3123
2827sub mouse_motion { 3124sub invoke_mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2829 3126
2830 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2833}
2834 3130
3131 0
3132}
3133
2835sub button_up { 3134sub invoke_button_up {
2836 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2837 3136
2838 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2839 undef $GRAB; 3138 undef $GRAB;
2840 $self->hide; 3139 $self->hide;
2841 3140
2842 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2844 } 3147 1
2845} 3148}
2846 3149
2847############################################################################# 3150#############################################################################
2848 3151
2849package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2850 3153
2851our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2852 3155
2853sub new { 3156sub new {
2854 my $class = shift; 3157 my $class = shift;
2855 3158
2856 $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 (
2857 fontsize => 0.8, 3338 fontsize => 0.8,
2858 @_, 3339 @_,
2859 ) 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
2860} 3347}
2861 3348
2862sub reorder { 3349sub reorder {
2863 my ($self) = @_; 3350 my ($self) = @_;
2864 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} };
2865 3357
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3360 }
2869 3361
… …
2872 my @items = sort { 3364 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2876 3368
3369 $self->{timer}->interval (1);
3370
2877 my $count = 10 + 1; 3371 my $count = 10 + 1;
2878 for my $item (@items) { 3372 for my $item (@items) {
2879 last unless --$count; 3373 last unless --$count;
2880 3374
2881 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3379 : $item->{text};
2886 3380
… …
2894 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3394 can_events => 1,
2901 can_hover => 1 3395 can_hover => 1
2902 }; 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;
2903 } 3409 }
2904 3410
2905 $self->clear; 3411 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2907} 3413}
… …
2912 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2914 3420
2915 return unless $text; 3421 return unless $text;
2916 3422
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3424
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3426
2921 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2923 $item->{count}++; 3429 $item->{count}++;
2924 } else { 3430 } else {
2925 $item->{count} = 1; 3431 $item->{count} = 1;
2926 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2927 } 3433 }
2928 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
2929 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
2930 delete $item->{label}; 3436 delete $item->{label};
2931 } else { 3437 } else {
2932 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
2933 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
2939 count => 1, 3445 count => 1,
2940 %arg, 3446 %arg,
2941 }; 3447 };
2942 } 3448 }
2943 3449
3450 $ROOT->on_refresh (reorder => sub {
2944 $self->reorder; 3451 $self->reorder;
3452 });
2945} 3453}
2946 3454
2947sub reconfigure { 3455sub reconfigure {
2948 my ($self) = @_; 3456 my ($self) = @_;
2949 3457
… …
2952 3460
2953 $self->reorder; 3461 $self->reorder;
2954 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
2955} 3463}
2956 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
2957############################################################################# 3473#############################################################################
2958 3474
2959package CFClient::UI::Root; 3475package CFClient::UI::Inventory;
2960 3476
2961our @ISA = CFClient::UI::Container::; 3477our @ISA = CFClient::UI::Table::;
2962
2963use CFClient::OpenGL;
2964 3478
2965sub new { 3479sub new {
2966 my $class = shift; 3480 my $class = shift;
2967 3481
2968 $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 => [],
2969 @_, 3527 @_,
2970 ) 3528 )
2971} 3529}
2972 3530
2973sub configure { 3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2974 my ($self, $x, $y, $w, $h) = @_;
2975 3532
2976 $self->{w} = $w; 3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2977 $self->{h} = $h; 3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2978} 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");
2979 3543
2980sub check_size { 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 {
2981 my ($self) = @_; 3617 my ($self, $spell) = @_;
2982 3618
2983 $self->size_allocate ($self->{w}, $self->{h}) 3619 $self->{spell}->{$spell->{name}} = $spell;
2984 if $self->{w}; 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 (
3651 visible => 1,
3652 @_,
3653 );
3654
3655 Scalar::Util::weaken ($self->{root} = $self);
3656
3657 $self
2985} 3658}
2986 3659
2987sub size_request { 3660sub size_request {
2988 my ($self) = @_; 3661 my ($self) = @_;
2989 3662
2990 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
2991} 3664}
2992 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
2993sub size_allocate { 3680sub invoke_size_allocate {
2994 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
2995 3682
2996 for my $child ($self->children) { 3683 for my $child ($self->children) {
2997 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)};
2998 3685
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3686 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3687 $Y = $child->{force_y} if exists $child->{force_y};
3001 3688
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3689 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3691
3008 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3009 } 3693 }
3694
3695 1
3010} 3696}
3011 3697
3012sub coord2local { 3698sub coord2local {
3013 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3014 3700
… …
3022} 3708}
3023 3709
3024sub update { 3710sub update {
3025 my ($self) = @_; 3711 my ($self) = @_;
3026 3712
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3713 $::WANT_REFRESH++;
3029} 3714}
3030 3715
3031sub add { 3716sub add {
3032 my ($self, @children) = @_; 3717 my ($self, @children) = @_;
3033 3718
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3719 $_->{is_toplevel} = 1
3042 3720 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3721
3048 $self->SUPER::add (@children); 3722 $self->SUPER::add (@children);
3049} 3723}
3050 3724
3051sub remove { 3725sub remove {
3052 my ($self, @children) = @_; 3726 my ($self, @children) = @_;
3053 3727
3054 $self->SUPER::remove (@children); 3728 $self->SUPER::remove (@children);
3729
3730 delete $self->{is_toplevel}
3731 for @children;
3055 3732
3056 while (@children) { 3733 while (@children) {
3057 my $w = pop @children; 3734 my $w = pop @children;
3058 push @children, $w->children; 3735 push @children, $w->children;
3059 $w->set_invisible; 3736 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3755 while ($self->{refresh_hook}) {
3079 $_->() 3756 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
3081 } 3758 }
3082 3759
3083 if ($self->{check_size}) { 3760 if ($self->{realloc}) {
3084 my @queue = ([], []); 3761 my %queue;
3762 my @queue;
3763 my $widget;
3085 3764
3086 for (;;) { 3765 outer:
3087 if ($self->{check_size}) { 3766 while () {
3088 # heuristic: check containers last 3767 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3768 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3769 $widget->{visible} or next; # do not resize invisible widgets
3770
3771 $queue{$widget+0}++ and next; # duplicates are common
3772
3773 push @{ $queue[$widget->{visible}] }, $widget;
3774 }
3091 } 3775 }
3092 3776
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3777 while () {
3778 @queue or last outer;
3094 3779
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3780 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3781 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 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}) {
3103 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
3105 3803
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3804 $self->{size_alloc}{$widget+0} = $widget;
3107 3805
3108 $widget->{parent}->check_size
3109 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 }
3110 } 3813 }
3814
3815 delete $self->{realloc}{$widget+0};
3111 } 3816 }
3112 } 3817 }
3113 3818
3114 while ($self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 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)};
3117 3827
3118 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3120 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
3121 $widget->{w} = $w; 3844 $widget->{w} = $w;
3122 $widget->{h} = $h; 3845 $widget->{h} = $h;
3846
3123 $widget->emit (size_allocate => $w, $h); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
3124 } 3849 }
3125 } 3850 }
3126 3851
3127 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3128 $_->() 3853 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3130 } 3855 }
3856
3131 3857
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3135 3861
… …
3137 glLoadIdentity; 3863 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3866 glLoadIdentity;
3141 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
3142 $self->_draw; 3875 $self->_draw;
3143} 3876}
3144 3877
3145############################################################################# 3878#############################################################################
3146 3879

Diff Legend

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