ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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