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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC

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

Diff Legend

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