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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.334 by root, Sun Jul 23 16:11:12 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
119 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 check_tooltip;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
172sub rescale_widgets { 186sub rescale_widgets {
173 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
174 188
175 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
193
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 194 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 195 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 196 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 197 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 198 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
200
201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
203
183 } 204 }
184 } 205 }
185 206
186 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
187} 216}
188 217
189############################################################################# 218#############################################################################
190 219
191package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
196 225
197sub new { 226sub new {
198 my $class = shift; 227 my $class = shift;
199 228
200 my $self = bless { 229 my $self = bless {
201 x => 0, 230 x => "center",
202 y => 0, 231 y => "center",
203 z => 0, 232 z => 0,
233 w => undef,
234 h => undef,
204 can_events => 1, 235 can_events => 1,
205 @_ 236 @_
206 }, $class; 237 }, $class;
238
239 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 240
208 for (keys %$self) { 241 for (keys %$self) {
209 if (/^on_(.*)$/) { 242 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 243 $self->connect ($1 => delete $self->{$_});
211 } 244 }
212 } 245 }
213 246
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 247 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 249 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 250 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 251 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
252
253 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255
256 $self->show if $layout->{show};
221 } 257 }
222 258
223 $self 259 $self
224} 260}
225 261
… …
236 return if $self->{parent}; 272 return if $self->{parent};
237 273
238 $CFClient::UI::ROOT->add ($self); 274 $CFClient::UI::ROOT->add ($self);
239} 275}
240 276
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 277sub set_visible {
254 my ($self) = @_; 278 my ($self) = @_;
255 279
256 return if $self->{visible}; 280 return if $self->{visible};
257 281
258 $self->{root} = $self->{parent}{root}; 282 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 283 $self->{visible} = $self->{parent}{visible} + 1;
260 284
261 $self->emit (visibility_change => 1); 285 $self->emit (visibility_change => 1);
286
287 $self->realloc if !exists $self->{req_w};
288
289 $_->set_visible for $self->children;
262} 290}
263 291
264sub set_invisible { 292sub set_invisible {
265 my ($self) = @_; 293 my ($self) = @_;
266 294
267 return unless $self->{visible}; 295 return unless $self->{visible};
268 296
269 # broken show/hide model 297 $_->set_invisible for $self->children;
270 298
299 delete $self->{visible};
271 delete $self->{root}; 300 delete $self->{root};
272 delete $self->{visible};
273 301
274 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
276 304
277 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
279 307
280 $self->focus_out; 308 $self->emit ("focus_out");
281
282 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
283} 310}
284 311
285sub set_visibility { 312sub set_visibility {
286 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
306 333
307 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
308 if $self->{parent}; 335 if $self->{parent};
309} 336}
310 337
311sub move { 338sub move_abs {
312 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
313 340
314 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
315 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
316 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
317 344
318 $self->update; 345 $self->update;
319} 346}
320 347
321sub set_size { 348sub set_size {
322 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
323 350
324 $self->{def_w} = $w; 351 $self->{force_w} = $w;
325 $self->{def_h} = $h; 352 $self->{force_h} = $h;
326 353
327 $self->check_size; 354 $self->realloc;
328} 355}
329 356
330sub size_request { 357sub size_request {
331 require Carp; 358 require Carp;
332 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
333} 360}
334 361
362sub baseline_shift {
363 0
364}
365
335sub configure { 366sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
337 368
338 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, int $w / $self->{aspect};
341 374
342 # use alignment to adjust x, y 375 # use alignment to adjust x, y
343 376
344 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 379 }
349 380
350 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 382 $self->{x} = $x;
352 $self->{y} = $y; 383 $self->{y} = $y;
353 $self->update; 384 $self->update;
354 } 385 }
355 386
356 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 388 return unless $self->{visible};
358 }
359}
360 389
361sub size_allocate { 390 $self->{alloc_w} = $w;
362 # nothing to be done 391 $self->{alloc_h} = $h;
363}
364 392
365sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
366 my ($self) = @_; 394 }
367
368 $self->check_size (1);
369 $self->update;
370} 395}
371 396
372sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
373} 403}
374 404
375sub set_max_size { 405sub set_max_size {
376 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
377 407
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
380} 412}
381 413
382sub set_tooltip { 414sub set_tooltip {
383 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
384 416
… …
389 421
390 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
391 423
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
395 } 427 }
396} 428}
397 429
398# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
399sub coord2local { 431sub coord2local {
400 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
401 433
434 Carp::confess unless $self->{parent};#d#
435
402 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
403} 437}
404 438
405# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
406sub coord2global { 440sub coord2global {
407 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
408 442
443 Carp::confess unless $self->{parent};#d#
444
409 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
410} 446}
411 447
412sub focus_in { 448sub invoke_focus_in {
413 my ($self) = @_; 449 my ($self) = @_;
414 450
415 return if $FOCUS == $self; 451 return if $FOCUS == $self;
416 return unless $self->{can_focus}; 452 return unless $self->{can_focus};
417 453
418 my $focus = $FOCUS; $FOCUS = $self; 454 $FOCUS = $self;
419 455
420 $self->_emit (focus_in => $focus); 456 $self->update;
421 457
422 $focus->update if $focus; 458 0
423 $FOCUS->update;
424} 459}
425 460
426sub focus_out { 461sub invoke_focus_out {
427 my ($self) = @_; 462 my ($self) = @_;
428 463
429 return unless $FOCUS == $self; 464 return unless $FOCUS == $self;
430 465
431 my $focus = $FOCUS; undef $FOCUS; 466 undef $FOCUS;
432 467
433 $self->_emit (focus_out => $focus); 468 $self->update;
434 469
435 $focus->update if $focus; #?
436
437 $::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
438 unless $FOCUS; 471 unless $FOCUS;
439}
440 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
441sub mouse_motion { } 483sub invoke_mouse_motion { 0 }
442sub button_up { } 484sub invoke_button_up { 0 }
443sub key_down { } 485sub invoke_key_down { 0 }
444sub key_up { } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
445 488
446sub button_down { 489sub invoke_button_down {
447 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
448 491
449 $self->focus_in; 492 $self->grab_focus;
450}
451 493
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 494 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 495}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 496
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 497sub connect {
456sub 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
457 583
458sub draw { 584sub draw {
459 my ($self) = @_; 585 my ($self) = @_;
460 586
461 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);
462 596
463 glPushMatrix; 597 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 598 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 599
468 if ($self == $HOVER && $self->{can_hover}) { 600 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 601 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 602 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 604 glBegin GL_QUADS;
475 glVertex $x , $y; 605 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 606 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 607 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 608 glVertex 0 , $self->{h};
479 glEnd; 609 glEnd;
480 glDisable GL_BLEND; 610 glDisable GL_BLEND;
481 } 611 }
482 612
483 if ($ENV{PCLIENT_DEBUG}) { 613 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 614 glPushMatrix;
485 glColor 1, 1, 0, 1; 615 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 616 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 617 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 618 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 619 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 620 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 621 glVertex 0 , $self->{h} - 1;
492 glEnd; 622 glEnd;
493 glPopMatrix; 623 glPopMatrix;
494 #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;
495 } 625 }
626
627 $self->_draw;
628 glPopMatrix;
496} 629}
497 630
498sub _draw { 631sub _draw {
499 my ($self) = @_; 632 my ($self) = @_;
500 633
501 warn "no draw defined for $self\n"; 634 warn "no draw defined for $self\n";
502} 635}
503 636
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 637sub DESTROY {
564 my ($self) = @_; 638 my ($self) = @_;
565 639
640 return if CFClient::in_destruct;
641
566 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
567 #$self->deactivate; 643
644 eval { $self->destroy };
645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
568} 646}
569 647
570############################################################################# 648#############################################################################
571 649
572package CFClient::UI::DrawBG; 650package CFClient::UI::DrawBG;
… …
597 675
598 if ($color && (@$color < 4 || $color->[3])) { 676 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 677 my ($w, $h) = @$self{qw(w h)};
600 678
601 glEnable GL_BLEND; 679 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 680 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 681 glColor_premultiply @$color;
604 682
605 glBegin GL_QUADS; 683 glBegin GL_QUADS;
606 glVertex 0 , 0; 684 glVertex 0 , 0;
607 glVertex 0 , $h; 685 glVertex 0 , $h;
608 glVertex $w, $h; 686 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 701 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 702 $class->SUPER::new (can_events => 0, %arg);
625} 703}
626 704
627sub size_request { 705sub size_request {
628 (0, 0) 706 my ($self) = @_;
707
708 ($self->{w} + 0, $self->{h} + 0)
629} 709}
630 710
631sub draw { } 711sub draw { }
632 712
633############################################################################# 713#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 717our @ISA = CFClient::UI::Base::;
638 718
639sub new { 719sub new {
640 my ($class, %arg) = @_; 720 my ($class, %arg) = @_;
641 721
642 my $children = delete $arg{children} || []; 722 my $children = delete $arg{children};
643 723
644 my $self = $class->SUPER::new ( 724 my $self = $class->SUPER::new (
645 children => [], 725 children => [],
646 can_events => 0, 726 can_events => 0,
647 %arg, 727 %arg,
648 ); 728 );
729
649 $self->add ($_) for @$children; 730 $self->add (@$children)
731 if $children;
650 732
651 $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;
652} 742}
653 743
654sub add { 744sub add {
655 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
656 746
… …
662 $self->{children} = [ 752 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 753 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 754 @{$self->{children}}, @widgets
665 ]; 755 ];
666 756
667 $self->check_size (1); 757 $self->realloc;
668 $self->update;
669} 758}
670 759
671sub children { 760sub children {
672 @{ $_[0]{children} } 761 @{ $_[0]{children} }
673} 762}
… …
678 delete $child->{parent}; 767 delete $child->{parent};
679 $child->hide; 768 $child->hide;
680 769
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 770 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 771
683 $self->check_size (1); 772 $self->realloc;
684 $self->update;
685} 773}
686 774
687sub clear { 775sub clear {
688 my ($self) = @_; 776 my ($self) = @_;
689 777
… …
693 for (@$children) { 781 for (@$children) {
694 delete $_->{parent}; 782 delete $_->{parent};
695 $_->hide; 783 $_->hide;
696 } 784 }
697 785
698 $self->check_size; 786 $self->realloc;
699 $self->update;
700} 787}
701 788
702sub find_widget { 789sub find_widget {
703 my ($self, $x, $y) = @_; 790 my ($self, $x, $y) = @_;
704 791
705 $x -= $self->{x}; 792 $x -= $self->{x};
706 $y -= $self->{y}; 793 $y -= $self->{y};
707 794
708 my $res; 795 my $res;
709 796
710 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
712 and return $res; 799 and return $res;
713 } 800 }
714 801
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
736} 823}
737 824
738sub add { 825sub add {
739 my ($self, $child) = @_; 826 my ($self, $child) = @_;
740 827
741 $self->{children} = []; 828 $self->SUPER::remove ($_) for @{ $self->{children} };
742
743 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
744} 830}
745 831
746sub remove { 832sub remove {
747 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
… …
756 842
757sub size_request { 843sub size_request {
758 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
759} 845}
760 846
761sub size_allocate { 847sub invoke_size_allocate {
762 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
763 849
764 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
765} 853}
766 854
767############################################################################# 855#############################################################################
856
857# back-buffered drawing area
768 858
769package CFClient::UI::Window; 859package CFClient::UI::Window;
770 860
771our @ISA = CFClient::UI::Bin::; 861our @ISA = CFClient::UI::Bin::;
772 862
… …
783 873
784 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 874 $ROOT->on_post_alloc ($self => sub { $self->render_child });
785 $self->SUPER::update; 875 $self->SUPER::update;
786} 876}
787 877
788sub size_allocate { 878sub invoke_size_allocate {
789 my ($self, $w, $h) = @_; 879 my ($self, $w, $h) = @_;
790 880
791 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 881 $self->update;
882
883 $self->SUPER::invoke_size_allocate ($w, $h)
793} 884}
794 885
795sub _render { 886sub _render {
887 my ($self) = @_;
888
796 $_[0]{children}[0]->draw; 889 $self->{children}[0]->draw;
797} 890}
798 891
799sub render_child { 892sub render_child {
800 my ($self) = @_; 893 my ($self) = @_;
801 894
802 $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 {
803 glClearColor 0, 0, 0, 0; 896 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 897 glClear GL_COLOR_BUFFER_BIT;
805 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
806 $self->_render; 906 $self->_render;
807 }; 907 };
808} 908}
809 909
810sub _draw { 910sub _draw {
811 my ($self) = @_; 911 my ($self) = @_;
812 912
813 my ($w, $h) = ($self->w, $self->h); 913 my ($w, $h) = @$self{qw(w h)};
814 914
815 my $tex = $self->{texture} 915 my $tex = $self->{texture}
816 or return; 916 or return;
817 917
818 glEnable GL_TEXTURE_2D; 918 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 919 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 920 glColor 0, 0, 0, 1;
821 921
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 922 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 923
824 glDisable GL_TEXTURE_2D; 924 glDisable GL_TEXTURE_2D;
825} 925}
… …
841} 941}
842 942
843sub size_request { 943sub size_request {
844 my ($self) = @_; 944 my ($self) = @_;
845 945
846 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)};
847 947
848 $w = 10 if $self->{scroll_x}; 948 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 949 $h = 10 if $self->{scroll_y};
850 950
851 ($w, $h) 951 ($w, $h)
852} 952}
853 953
854sub size_allocate { 954sub invoke_size_allocate {
855 my ($self, $w, $h) = @_; 955 my ($self, $w, $h) = @_;
856 956
957 my $child = $self->child;
958
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 959 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 960 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 961
860 $self->child->configure (0, 0, $w, $h); 962 $self->child->configure (0, 0, $w, $h);
861 $self->update; 963 $self->update;
964
965 1
862} 966}
863 967
864sub set_offset { 968sub set_offset {
865 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
866 970
… …
899} 1003}
900 1004
901sub _render { 1005sub _render {
902 my ($self) = @_; 1006 my ($self) = @_;
903 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
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1011 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 1012
906 $self->SUPER::_render; 1013 $self->SUPER::_render;
907} 1014}
908 1015
… …
911package CFClient::UI::ScrolledWindow; 1018package CFClient::UI::ScrolledWindow;
912 1019
913our @ISA = CFClient::UI::HBox::; 1020our @ISA = CFClient::UI::HBox::;
914 1021
915sub new { 1022sub new {
916 my $class = shift; 1023 my ($class, %arg) = @_;
1024
1025 my $child = delete $arg{child};
917 1026
918 my $self; 1027 my $self;
919 1028
920 my $slider = new CFClient::UI::Slider 1029 my $slider = new CFClient::UI::Slider
921 vertical => 1, 1030 vertical => 1,
… …
924 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
925 }, 1034 },
926 ; 1035 ;
927 1036
928 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
930 slider => $slider, 1040 slider => $slider,
931 @_, 1041 %arg,
932 ); 1042 );
933 1043
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
1045 $self->add ($child) if $child;
937 1046
938 $self 1047 $self
939} 1048}
940 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
941sub update { 1074sub update {
942 my ($self) = @_; 1075 my ($self) = @_;
943 1076
944 $self->SUPER::update; 1077 $self->SUPER::update;
945 1078
946 # todo: overwrite size_allocate of child 1079 $self->update_slider;
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949} 1080}
950 1081
951sub size_allocate { 1082sub invoke_size_allocate {
952 my ($self, $w, $h) = @_; 1083 my ($self, $w, $h) = @_;
953 1084
1085 $self->update_slider;
1086
954 $self->SUPER::size_allocate ($w, $h); 1087 $self->SUPER::invoke_size_allocate ($w, $h)
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1088}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962 1089
963############################################################################# 1090#############################################################################
964 1091
965package CFClient::UI::Frame; 1092package CFClient::UI::Frame;
966 1093
… …
982 1109
983 if ($self->{bg}) { 1110 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1111 my ($w, $h) = @$self{qw(w h)};
985 1112
986 glEnable GL_BLEND; 1113 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1114 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1115 glColor_premultiply @{ $self->{bg} };
989 1116
990 glBegin GL_QUADS; 1117 glBegin GL_QUADS;
991 glVertex 0 , 0; 1118 glVertex 0 , 0;
992 glVertex 0 , $h; 1119 glVertex 0 , $h;
993 glVertex $w, $h; 1120 glVertex $w, $h;
… …
1006 1133
1007our @ISA = CFClient::UI::Bin::; 1134our @ISA = CFClient::UI::Bin::;
1008 1135
1009use CFClient::OpenGL; 1136use CFClient::OpenGL;
1010 1137
1011my @tex = 1138my $bg =
1139 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1140 mipmap => 1, wrap => 1;
1141
1142my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1143 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1144 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1145
1015sub new { 1146sub new {
1016 my $class = shift; 1147 my ($class, %arg) = @_;
1017 1148
1018 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1152 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1153 can_events => 1,
1024 @_ 1154 min_w => 64,
1155 min_h => 32,
1156 %arg,
1025 ); 1157 );
1026 1158
1027 $self->{title} &&= new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1160 align => 0,
1029 valign => 1, 1161 valign => 1,
1030 text => $self->{title}, 1162 text => $self->{title},
1031 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 }
1032 1174
1033 $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};
1034} 1184}
1035 1185
1036sub border { 1186sub border {
1037 int $_[0]{border} * $::FONTSIZE 1187 int $_[0]{border} * $::FONTSIZE
1038} 1188}
1039 1189
1040sub size_request { 1190sub size_request {
1041 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};
1042 1198
1043 my ($w, $h) = $self->SUPER::size_request; 1199 my ($w, $h) = $self->SUPER::size_request;
1044 1200
1045 ( 1201 (
1046 $w + $self->border * 2, 1202 $w + $self->border * 2,
1047 $h + $self->border * 2, 1203 $h + $self->border * 2,
1048 ) 1204 )
1049} 1205}
1050 1206
1051sub size_allocate { 1207sub invoke_size_allocate {
1052 my ($self, $w, $h) = @_; 1208 my ($self, $w, $h) = @_;
1053 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
1054 $h -= List::Util::max 0, $self->border * 2; 1218 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1219 $w -= List::Util::max 0, $border * 2;
1056 1220
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1221 $self->child->configure ($border, $border, $w, $h);
1061}
1062 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
1063sub button_down { 1237sub invoke_button_down {
1064 my ($self, $ev, $x, $y) = @_; 1238 my ($self, $ev, $x, $y) = @_;
1065 1239
1066 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
1067 my $border = $self->border; 1241 my $border = $self->border;
1068 1242
… …
1081 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1082 1256
1083 my $dx = $ev->{x} - $ox; 1257 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1258 my $dy = $ev->{y} - $oy;
1085 1259
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1260 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1261 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1262
1091 $self->check_size; 1263 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1264 $self->realloc;
1092 }; 1265 };
1093 1266
1094 } elsif ($lr ^ $td) { 1267 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1268 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1269 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1271 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1272 my ($ev, $x, $y) = @_;
1100 1273
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1274 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1275
1103 $self->{user_x} = $bx + $x - $ox; 1276 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1277 # HACK: the next line is required to enforce placement
1105 1278 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1279 };
1280 } else {
1281 return 0;
1282 }
1283
1109 } 1284 1
1110} 1285}
1111 1286
1112sub button_up { 1287sub invoke_button_up {
1113 my ($self, $ev, $x, $y) = @_; 1288 my ($self, $ev, $x, $y) = @_;
1114 1289
1115 delete $self->{motion}; 1290 ! ! delete $self->{motion}
1116} 1291}
1117 1292
1118sub mouse_motion { 1293sub invoke_mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1294 my ($self, $ev, $x, $y) = @_;
1120 1295
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1296 $self->{motion}->($ev, $x, $y) if $self->{motion};
1297
1298 ! ! $self->{motion}
1122} 1299}
1123 1300
1124sub _draw { 1301sub _draw {
1125 my ($self) = @_; 1302 my ($self) = @_;
1126 1303
1304 my $child = $self->{children}[0];
1305
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1306 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1307 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1308
1130 glEnable GL_TEXTURE_2D; 1309 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1311
1133 my $border = $self->border; 1312 my $border = $self->border;
1134 1313
1135 glColor @{ $self->{border_bg} }; 1314 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1315 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1316 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1317 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1318 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1319
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1320 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1321 glColor @{ $self->{bg} };
1143 1322
1144 # TODO: repeat texture not scale 1323 # TODO: repeat texture not scale
1324 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1325 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1326 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1327 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1328 }
1155 1329
1156 glDisable GL_TEXTURE_2D; 1330 glDisable GL_TEXTURE_2D;
1157 1331
1158 $self->{title}->draw if $self->{title};
1159
1160 $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};
1161} 1343}
1162 1344
1163############################################################################# 1345#############################################################################
1164 1346
1165package CFClient::UI::Table; 1347package CFClient::UI::Table;
… …
1182sub children { 1364sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1184} 1366}
1185 1367
1186sub add { 1368sub add {
1187 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1188 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1189 $child->set_parent ($self); 1373 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1191 1376
1192 $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
1193} 1386}
1194 1387
1195# 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?
1196sub clear { 1389sub clear {
1197 my ($self) = @_; 1390 my ($self) = @_;
… …
1202 for (@children) { 1395 for (@children) {
1203 delete $_->{parent}; 1396 delete $_->{parent};
1204 $_->hide; 1397 $_->hide;
1205 } 1398 }
1206 1399
1207 $self->check_size (1); 1400 $self->realloc;
1208 $self->update;
1209} 1401}
1210 1402
1211sub get_wh { 1403sub get_wh {
1212 my ($self) = @_; 1404 my ($self) = @_;
1213 1405
… …
1239 (sum @$ws), 1431 (sum @$ws),
1240 (sum @$hs), 1432 (sum @$hs),
1241 ) 1433 )
1242} 1434}
1243 1435
1244sub size_allocate { 1436sub invoke_size_allocate {
1245 my ($self, $w, $h) = @_; 1437 my ($self, $w, $h) = @_;
1246 1438
1247 my ($ws, $hs) = $self->get_wh; 1439 my ($ws, $hs) = $self->get_wh;
1248 1440
1249 my $req_w = (sum @$ws) || 1; 1441 my $req_w = (sum @$ws) || 1;
… …
1281 } 1473 }
1282 1474
1283 $y += $row_h; 1475 $y += $row_h;
1284 } 1476 }
1285 1477
1478 1
1286} 1479}
1287 1480
1288sub find_widget { 1481sub find_widget {
1289 my ($self, $x, $y) = @_; 1482 my ($self, $x, $y) = @_;
1290 1483
… …
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1520 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1521 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 ) 1522 )
1330} 1523}
1331 1524
1332sub size_allocate { 1525sub invoke_size_allocate {
1333 my ($self, $w, $h) = @_; 1526 my ($self, $w, $h) = @_;
1334 1527
1335 my $space = $self->{vertical} ? $h : $w; 1528 my $space = $self->{vertical} ? $h : $w;
1336 my $children = $self->{children}; 1529 my @children = $self->visible_children;
1337 1530
1338 my @req; 1531 my @req;
1339 1532
1340 if ($self->{homogeneous}) { 1533 if ($self->{homogeneous}) {
1341 @req = ($space / (@$children || 1)) x @$children; 1534 @req = ($space / (@children || 1)) x @children;
1342 } else { 1535 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1536 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1344 my $req = List::Util::sum @req; 1537 my $req = List::Util::sum @req;
1345 1538
1346 if ($req > $space) { 1539 if ($req > $space) {
1347 # ah well, not enough space 1540 # ah well, not enough space
1348 $_ *= $space / $req for @req; 1541 $_ *= $space / $req for @req;
1349 } else { 1542 } else {
1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1543 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1351 1544
1352 $space = ($space - $req) / $expand; # remaining space to give away 1545 $space = ($space - $req) / $expand; # remaining space to give away
1353 1546
1354 $req[$_] += $space * $children->[$_]{expand} 1547 $req[$_] += $space * $children[$_]{expand}
1355 for 0 .. $#$children; 1548 for 0 .. $#children;
1356 } 1549 }
1357 } 1550 }
1358 1551
1359 CFClient::UI::harmonize \@req; 1552 CFClient::UI::harmonize \@req;
1360 1553
1361 my $pos = 0; 1554 my $pos = 0;
1362 for (0 .. $#$children) { 1555 for (0 .. $#children) {
1363 my $alloc = $req[$_]; 1556 my $alloc = $req[$_];
1364 $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));
1365 1558
1366 $pos += $alloc; 1559 $pos += $alloc;
1367 } 1560 }
1368 1561
1369 1 1562 1
… …
1421 ellipsise => 3, # end 1614 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1615 layout => (new CFClient::Layout),
1423 fontsize => 1, 1616 fontsize => 1,
1424 align => -1, 1617 align => -1,
1425 valign => -1, 1618 valign => -1,
1426 padding => 2, 1619 padding_x => 2,
1620 padding_y => 2,
1427 can_events => 0, 1621 can_events => 0,
1428 %arg 1622 %arg
1429 ); 1623 );
1430 1624
1431 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
… …
1441 } 1635 }
1442 1636
1443 $self 1637 $self
1444} 1638}
1445 1639
1446sub escape($) {
1447 local $_ = $_[0];
1448
1449 s/&/&amp;/g;
1450 s/>/&gt;/g;
1451 s/</&lt;/g;
1452
1453 $_
1454}
1455
1456sub update { 1640sub update {
1457 my ($self) = @_; 1641 my ($self) = @_;
1458 1642
1459 delete $self->{texture}; 1643 delete $self->{texture};
1460 $self->SUPER::update; 1644 $self->SUPER::update;
1461} 1645}
1462 1646
1647sub realloc {
1648 my ($self) = @_;
1649
1650 delete $self->{ox};
1651 $self->SUPER::realloc;
1652}
1653
1463sub set_text { 1654sub set_text {
1464 my ($self, $text) = @_; 1655 my ($self, $text) = @_;
1465 1656
1466 return if $self->{text} eq "T$text"; 1657 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1658 $self->{text} = "T$text";
1468 1659
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1660 $self->{layout}->set_text ($text);
1471 1661
1662 delete $self->{size_req};
1663 $self->realloc;
1472 $self->update; 1664 $self->update;
1473 $self->check_size;
1474} 1665}
1475 1666
1476sub set_markup { 1667sub set_markup {
1477 my ($self, $markup) = @_; 1668 my ($self, $markup) = @_;
1478 1669
1479 return if $self->{text} eq "M$markup"; 1670 return if $self->{text} eq "M$markup";
1480 $self->{text} = "M$markup"; 1671 $self->{text} = "M$markup";
1481 1672
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1673 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1674
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1675 $self->{layout}->set_markup ($markup);
1486 1676
1677 delete $self->{size_req};
1678 $self->realloc;
1487 $self->update; 1679 $self->update;
1488 $self->check_size;
1489} 1680}
1490 1681
1491sub size_request { 1682sub size_request {
1492 my ($self) = @_; 1683 my ($self) = @_;
1493 1684
1685 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1686 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1687 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1688 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1689 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1690 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1691
1500 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1501 1693
1502 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1503 $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);
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1698
1506 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1507 1700
1508 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1702 $h = List::Util::max $h, $h2;
1703 }
1704
1705 [$w, $h]
1510 } 1706 };
1511 1707
1512 ( 1708 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1709}
1517 1710
1711sub baseline_shift {
1712 $_[0]{layout}->descent
1713}
1714
1518sub size_allocate { 1715sub invoke_size_allocate {
1519 my ($self, $w, $h) = @_; 1716 my ($self, $w, $h) = @_;
1520 1717
1718 delete $self->{ox};
1719
1521 delete $self->{texture}; 1720 delete $self->{texture}
1721 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1722
1723 1
1522} 1724}
1523 1725
1524sub set_fontsize { 1726sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1727 my ($self, $fontsize) = @_;
1526 1728
1527 $self->{fontsize} = $fontsize; 1729 $self->{fontsize} = $fontsize;
1730 delete $self->{size_req};
1528 delete $self->{texture}; 1731 delete $self->{texture};
1529 1732
1530 $self->update; 1733 $self->realloc;
1531 $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;
1532} 1743}
1533 1744
1534sub _draw { 1745sub _draw {
1535 my ($self) = @_; 1746 my ($self) = @_;
1536 1747
1537 $self->SUPER::_draw; # draw background, if applicable 1748 $self->SUPER::_draw; # draw background, if applicable
1538 1749
1539 my $tex = $self->{texture} ||= do { 1750 my $size = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}}); 1751 $self->{layout}->set_foreground (@{$self->{fg}});
1541 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1752 $self->{layout}->set_font ($self->{font}) if $self->{font};
1542 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1757
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1758 [$self->{layout}->size]
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1759 };
1559 1760
1560 glEnable GL_TEXTURE_2D; 1761 unless (exists $self->{ox}) {
1561 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);
1562 1765
1563 if ($tex->{format} == GL_ALPHA) { 1766 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 glColor @{$self->{fg}}; 1767 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1768 : ($self->{h} - $size->[1]) * 0.5);
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 } 1769 };
1569 1770
1570 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});
1571} 1775}
1572 1776
1573############################################################################# 1777#############################################################################
1574 1778
1575package CFClient::UI::EntryBase; 1779package CFClient::UI::EntryBase;
… …
1589 can_hover => 1, 1793 can_hover => 1,
1590 can_focus => 1, 1794 can_focus => 1,
1591 valign => 0, 1795 valign => 0,
1592 can_events => 1, 1796 can_events => 1,
1593 #text => ... 1797 #text => ...
1798 #hidden => "*",
1594 @_ 1799 @_
1595 ) 1800 )
1596} 1801}
1597 1802
1598sub _set_text { 1803sub _set_text {
… …
1600 1805
1601 delete $self->{cur_h}; 1806 delete $self->{cur_h};
1602 1807
1603 return if $self->{text} eq $text; 1808 return if $self->{text} eq $text;
1604 1809
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1811 $self->{text} = $text;
1609 1812
1610 $text =~ s/./*/g if $self->{hidden}; 1813 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1814 $self->{layout}->set_text ("$text ");
1815 delete $self->{size_req};
1612 1816
1613 $self->_emit (changed => $self->{text}); 1817 $self->emit (changed => $self->{text});
1818
1819 $self->realloc;
1820 $self->update;
1614} 1821}
1615 1822
1616sub set_text { 1823sub set_text {
1617 my ($self, $text) = @_; 1824 my ($self, $text) = @_;
1618 1825
1619 $self->{cursor} = length $text; 1826 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1827 $self->_set_text ($text);
1621 $self->update;
1622 $self->check_size;
1623} 1828}
1624 1829
1625sub get_text { 1830sub get_text {
1626 $_[0]{text} 1831 $_[0]{text}
1627} 1832}
… …
1632 my ($w, $h) = $self->SUPER::size_request; 1837 my ($w, $h) = $self->SUPER::size_request;
1633 1838
1634 ($w + 1, $h) # add 1 for cursor 1839 ($w + 1, $h) # add 1 for cursor
1635} 1840}
1636 1841
1637sub key_down { 1842sub invoke_key_down {
1638 my ($self, $ev) = @_; 1843 my ($self, $ev) = @_;
1639 1844
1640 my $mod = $ev->{mod}; 1845 my $mod = $ev->{mod};
1641 my $sym = $ev->{sym}; 1846 my $sym = $ev->{sym};
1642 my $uni = $ev->{unicode}; 1847 my $uni = $ev->{unicode};
… …
1654 } elsif ($sym == CFClient::SDLK_HOME) { 1859 } elsif ($sym == CFClient::SDLK_HOME) {
1655 $self->{cursor} = 0; 1860 $self->{cursor} = 0;
1656 } elsif ($sym == CFClient::SDLK_END) { 1861 } elsif ($sym == CFClient::SDLK_END) {
1657 $self->{cursor} = length $text; 1862 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1863 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1864 $self->emit ('escape');
1660 } elsif ($uni) { 1865 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1866 substr $text, $self->{cursor}++, 0, chr $uni;
1867 } else {
1868 return 0;
1662 } 1869 }
1663 1870
1664 $self->_set_text ($text); 1871 $self->_set_text ($text);
1665 $self->update;
1666 $self->check_size;
1667}
1668 1872
1873 $self->realloc;
1874
1875 1
1876}
1877
1669sub focus_in { 1878sub invoke_focus_in {
1670 my ($self) = @_; 1879 my ($self) = @_;
1671 1880
1672 $self->{last_activity} = $::NOW; 1881 $self->{last_activity} = $::NOW;
1673 1882
1674 $self->SUPER::focus_in; 1883 $self->SUPER::invoke_focus_in
1675} 1884}
1676 1885
1677sub button_down { 1886sub invoke_button_down {
1678 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1679 1888
1680 $self->SUPER::button_down ($ev, $x, $y); 1889 $self->SUPER::invoke_button_down ($ev, $x, $y);
1681 1890
1682 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1683 1892
1684 # byte-index to char-index 1893 # byte-index to char-index
1685 my $text = $self->{text}; 1894 my $text = $self->{text};
1686 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1688 1897
1689 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1690 $self->update; 1899 $self->update;
1900
1901 1
1691} 1902}
1692 1903
1693sub mouse_motion { 1904sub invoke_mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1905 my ($self, $ev, $x, $y) = @_;
1695# 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
1696} 1909}
1697 1910
1698sub _draw { 1911sub _draw {
1699 my ($self) = @_; 1912 my ($self) = @_;
1700 1913
1701 local $self->{fg} = $self->{fg}; 1914 local $self->{fg} = $self->{fg};
1702 1915
1703 if ($FOCUS == $self) { 1916 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1917 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1918 $self->{fg} = $self->{active_fg};
1706 } else { 1919 } else {
1707 glColor @{$self->{bg}}; 1920 glColor_premultiply @{$self->{bg}};
1708 } 1921 }
1709 1922
1710 glEnable GL_BLEND; 1923 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1924 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1925 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1926 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1927 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1928 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1929 glVertex $self->{w}, 0;
… …
1741 1954
1742our @ISA = CFClient::UI::EntryBase::; 1955our @ISA = CFClient::UI::EntryBase::;
1743 1956
1744use CFClient::OpenGL; 1957use CFClient::OpenGL;
1745 1958
1746sub key_down { 1959sub invoke_key_down {
1747 my ($self, $ev) = @_; 1960 my ($self, $ev) = @_;
1748 1961
1749 my $sym = $ev->{sym}; 1962 my $sym = $ev->{sym};
1750 1963
1751 if ($sym == 13) { 1964 if ($sym == 13) {
1752 unshift @{$self->{history}}, 1965 unshift @{$self->{history}},
1753 my $txt = $self->get_text; 1966 my $txt = $self->get_text;
1967
1754 $self->{history_pointer} = -1; 1968 $self->{history_pointer} = -1;
1755 $self->{history_saveback} = ''; 1969 $self->{history_saveback} = '';
1756 $self->_emit (activate => $txt); 1970 $self->emit (activate => $txt);
1757 $self->update; 1971 $self->update;
1758 1972
1759 } elsif ($sym == CFClient::SDLK_UP) { 1973 } elsif ($sym == CFClient::SDLK_UP) {
1760 if ($self->{history_pointer} < 0) { 1974 if ($self->{history_pointer} < 0) {
1761 $self->{history_saveback} = $self->get_text; 1975 $self->{history_saveback} = $self->get_text;
… …
1777 } else { 1991 } else {
1778 $self->set_text ($self->{history_saveback}); 1992 $self->set_text ($self->{history_saveback});
1779 } 1993 }
1780 1994
1781 } else { 1995 } else {
1782 $self->SUPER::key_down ($ev); 1996 return $self->SUPER::invoke_key_down ($ev)
1997 }
1998
1783 } 1999 1
1784
1785} 2000}
1786 2001
1787############################################################################# 2002#############################################################################
1788 2003
1789package CFClient::UI::Button; 2004package CFClient::UI::Button;
… …
1798 2013
1799sub new { 2014sub new {
1800 my $class = shift; 2015 my $class = shift;
1801 2016
1802 $class->SUPER::new ( 2017 $class->SUPER::new (
1803 padding => 4, 2018 padding_x => 4,
2019 padding_y => 4,
1804 fg => [1, 1, 1], 2020 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 2021 active_fg => [0, 0, 1],
1806 can_hover => 1, 2022 can_hover => 1,
1807 align => 0, 2023 align => 0,
1808 valign => 0, 2024 valign => 0,
1809 can_events => 1, 2025 can_events => 1,
1810 @_ 2026 @_
1811 ) 2027 )
1812} 2028}
1813 2029
1814sub activate { }
1815
1816sub button_up { 2030sub invoke_button_up {
1817 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
1818 2032
1819 $self->emit ("activate") 2033 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1822} 2038}
1823 2039
1824sub _draw { 2040sub _draw {
1825 my ($self) = @_; 2041 my ($self) = @_;
1826 2042
1827 local $self->{fg} = $self->{fg}; 2043 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 2044
1833 glEnable GL_TEXTURE_2D; 2045 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2046 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 2047 glColor 0, 0, 0, 1;
1836 2048
… …
1841 $self->SUPER::_draw; 2053 $self->SUPER::_draw;
1842} 2054}
1843 2055
1844############################################################################# 2056#############################################################################
1845 2057
2058package CFClient::UI::ImageButton;
2059
2060our @ISA = CFClient::UI::Image::;
2061
2062use CFClient::OpenGL;
2063
2064my %textures;
2065
2066sub new {
2067 my $class = shift;
2068
2069 my $self = $class->SUPER::new (
2070 padding_x => 4,
2071 padding_y => 4,
2072 fg => [1, 1, 1],
2073 active_fg => [0, 0, 1],
2074 can_hover => 1,
2075 align => 0,
2076 valign => 0,
2077 can_events => 1,
2078 @_
2079 );
2080}
2081
2082sub invoke_button_up {
2083 my ($self, $ev, $x, $y) = @_;
2084
2085 $self->emit ("activate")
2086 if $x >= 0 && $x < $self->{w}
2087 && $y >= 0 && $y < $self->{h};
2088
2089 1
2090}
2091
2092#############################################################################
2093
1846package CFClient::UI::CheckBox; 2094package CFClient::UI::CheckBox;
1847 2095
1848our @ISA = CFClient::UI::DrawBG::; 2096our @ISA = CFClient::UI::DrawBG::;
1849 2097
1850my @tex = 2098my @tex =
… …
1855 2103
1856sub new { 2104sub new {
1857 my $class = shift; 2105 my $class = shift;
1858 2106
1859 $class->SUPER::new ( 2107 $class->SUPER::new (
1860 padding => 2, 2108 padding_x => 2,
2109 padding_y => 2,
1861 fg => [1, 1, 1], 2110 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2111 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2112 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2113 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2114 state => 0,
… …
1869} 2118}
1870 2119
1871sub size_request { 2120sub size_request {
1872 my ($self) = @_; 2121 my ($self) = @_;
1873 2122
1874 ($self->{padding} * 2 + 6) x 2 2123 (6) x 2
1875} 2124}
1876 2125
2126sub toggle {
2127 my ($self) = @_;
2128
2129 $self->{state} = !$self->{state};
2130 $self->emit (changed => $self->{state});
2131 $self->update;
2132}
2133
1877sub button_down { 2134sub invoke_button_down {
1878 my ($self, $ev, $x, $y) = @_; 2135 my ($self, $ev, $x, $y) = @_;
1879 2136
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2137 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2138 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2139 $self->toggle;
1883 $self->_emit (changed => $self->{state}); 2140 } else {
2141 return 0
2142 }
2143
1884 } 2144 1
1885} 2145}
1886 2146
1887sub _draw { 2147sub _draw {
1888 my ($self) = @_; 2148 my ($self) = @_;
1889 2149
1890 $self->SUPER::_draw; 2150 $self->SUPER::_draw;
1891 2151
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2152 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2153
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2154 my ($w, $h) = @$self{qw(w h)};
2155
2156 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2157
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2158 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2159
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2160 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2161
… …
1907package CFClient::UI::Image; 2169package CFClient::UI::Image;
1908 2170
1909our @ISA = CFClient::UI::Base::; 2171our @ISA = CFClient::UI::Base::;
1910 2172
1911use CFClient::OpenGL; 2173use CFClient::OpenGL;
1912use Carp qw/confess/;
1913 2174
1914our %loaded_images; 2175our %texture_cache;
1915 2176
1916sub new { 2177sub new {
1917 my $class = shift; 2178 my $class = shift;
1918 2179
1919 my $self = $class->SUPER::new (can_events => 0, @_); 2180 my $self = $class->SUPER::new (
2181 can_events => 0,
2182 @_,
2183 );
1920 2184
1921 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
1922 2187
1923 $loaded_images{$self->{image}} ||= 2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1924 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1925 2190
1926 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2191 Scalar::Util::weaken $texture_cache{$self->{path}};
1927 2192
1928 Scalar::Util::weaken $loaded_images{$self->{image}}; 2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1929
1930 $self->{aspect} = $tex->{w} / $tex->{h};
1931 2194
1932 $self 2195 $self
1933} 2196}
1934 2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2201 warn "freeze<$self>\n";#d#
2202
2203 $self->{path}
2204 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206 $self->{path}
2207}
2208
2209sub STORABLE_attach {
2210 my ($self, $cloning, $path) = @_;
2211 warn "attach<@_>\n";#d#
2212
2213 $self->new (path => $path)
2214}
2215
1935sub size_request { 2216sub size_request {
1936 my ($self) = @_; 2217 my ($self) = @_;
1937 2218
1938 ($self->{tex}->{w}, $self->{tex}->{h}) 2219 ($self->{tex}{w}, $self->{tex}{h})
1939} 2220}
1940 2221
1941sub _draw { 2222sub _draw {
1942 my ($self) = @_; 2223 my ($self) = @_;
1943 2224
… …
1953 } 2234 }
1954 2235
1955 glEnable GL_TEXTURE_2D; 2236 glEnable GL_TEXTURE_2D;
1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2237 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1957 2238
1958 $tex->draw_quad_alpha (0, 0, $w, $h); 2239 $tex->draw_quad (0, 0, $w, $h);
1959 2240
1960 glDisable GL_TEXTURE_2D; 2241 glDisable GL_TEXTURE_2D;
1961} 2242}
1962 2243
1963############################################################################# 2244#############################################################################
… …
2052 my $ycut1 = max 0, min 1, $ycut; 2333 my $ycut1 = max 0, min 1, $ycut;
2053 my $ycut2 = max 0, min 1, $ycut - 1; 2334 my $ycut2 = max 0, min 1, $ycut - 1;
2054 2335
2055 my $h1 = $self->{h} * (1 - $ycut1); 2336 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2337 my $h2 = $self->{h} * (1 - $ycut2);
2338 my $h3 = $self->{h};
2339
2340 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2057 2341
2058 glEnable GL_BLEND; 2342 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2343 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2344 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2345 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2347
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2348 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2349 glBegin GL_QUADS;
… …
2079 2364
2080 if ($t3) { 2365 if ($t3) {
2081 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2366 glBindTexture GL_TEXTURE_2D, $t3->{name};
2082 glBegin GL_QUADS; 2367 glBegin GL_QUADS;
2083 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2368 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2084 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2369 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2085 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2370 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2086 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2371 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2087 glEnd; 2372 glEnd;
2088 } 2373 }
2089 2374
2090 glDisable GL_BLEND; 2375 glDisable GL_BLEND;
… …
2164 fg => [1, 1, 1], 2449 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2450 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2451 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2452 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2453 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2454 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2455 min_h => $::WIDTH / 80,
2171 vertical => 0, 2456 vertical => 0,
2172 can_hover => 1, 2457 can_hover => 1,
2173 inner_pad => 0.02, 2458 inner_pad => 0.02,
2174 @_ 2459 @_
2175 ); 2460 );
… …
2183sub set_range { 2468sub set_range {
2184 my ($self, $range) = @_; 2469 my ($self, $range) = @_;
2185 2470
2186 ($range, $self->{range}) = ($self->{range}, $range); 2471 ($range, $self->{range}) = ($self->{range}, $range);
2187 2472
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}"; 2473 if ("@$range" ne "@{$self->{range}}") {
2474 $self->update;
2475 $self->set_value ($self->{range}[0]);
2476 }
2190} 2477}
2191 2478
2192sub set_value { 2479sub set_value {
2193 my ($self, $value) = @_; 2480 my ($self, $value) = @_;
2194 2481
… …
2205 if $unit; 2492 if $unit;
2206 2493
2207 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2494 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2208 2495
2209 if ($value != $old_value) { 2496 if ($value != $old_value) {
2210 $self->_emit (changed => $value); 2497 $self->emit (changed => $value);
2211 $self->update; 2498 $self->update;
2212 } 2499 }
2213} 2500}
2214 2501
2215sub size_request { 2502sub size_request {
2216 my ($self) = @_; 2503 my ($self) = @_;
2217 2504
2218 my $w = $self->{req_w}; 2505 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2506}
2223 2507
2224sub button_down { 2508sub invoke_button_down {
2225 my ($self, $ev, $x, $y) = @_; 2509 my ($self, $ev, $x, $y) = @_;
2226 2510
2227 $self->SUPER::button_down ($ev, $x, $y); 2511 $self->SUPER::invoke_button_down ($ev, $x, $y);
2228 2512
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2513 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2514
2231 $self->mouse_motion ($ev, $x, $y); 2515 $self->invoke_mouse_motion ($ev, $x, $y)
2232} 2516}
2233 2517
2234sub mouse_motion { 2518sub invoke_mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2519 my ($self, $ev, $x, $y) = @_;
2236 2520
2237 if ($GRAB == $self) { 2521 if ($GRAB == $self) {
2238 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2522 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2239 2523
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2524 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2525
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2526 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2527
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2528 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2529 } else {
2530 return 0;
2531 }
2532
2245 } 2533 1
2534}
2535
2536sub invoke_mouse_wheel {
2537 my ($self, $ev) = @_;
2538
2539 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540
2541 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2542
2543 ! ! $delta
2246} 2544}
2247 2545
2248sub update { 2546sub update {
2249 my ($self) = @_; 2547 my ($self) = @_;
2250 2548
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2549 delete $self->{knob_w};
2550 $self->SUPER::update;
2551}
2552
2553sub _draw {
2554 my ($self) = @_;
2555
2556 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2557 $self->set_value ($self->{range}[0]);
2253 2558
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2559 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2560 my $range = ($hi - $page - $lo) || 1e-100;
2256 2561
… …
2262 $value = ($value - $lo) / $range; 2567 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2568 $value = $value * $self->{scale} + $self->{offset};
2264 2569
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2570 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2571 $self->{knob_w} = $knob_w;
2267 }); 2572 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2573
2275 $self->SUPER::_draw (); 2574 $self->SUPER::_draw ();
2276 2575
2277 glScale $self->{w}, $self->{h}; 2576 glScale $self->{w}, $self->{h};
2278 2577
… …
2339sub set_range { shift->{slider}->set_range (@_) } 2638sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) } 2639sub set_value { shift->{slider}->set_value (@_) }
2341 2640
2342############################################################################# 2641#############################################################################
2343 2642
2344package CFClient::UI::TextView; 2643package CFClient::UI::TextScroller;
2345 2644
2346our @ISA = CFClient::UI::HBox::; 2645our @ISA = CFClient::UI::HBox::;
2347 2646
2348use CFClient::OpenGL; 2647use CFClient::OpenGL;
2349 2648
2350sub new { 2649sub new {
2351 my $class = shift; 2650 my $class = shift;
2352 2651
2353 my $self = $class->SUPER::new ( 2652 my $self = $class->SUPER::new (
2354 fontsize => 1, 2653 fontsize => 1,
2355 can_events => 0, 2654 can_events => 1,
2655 indent => 0,
2356 #font => default_font 2656 #font => default_font
2357 @_, 2657 @_,
2358 2658
2359 layout => (new CFClient::Layout 1), 2659 layout => (new CFClient::Layout),
2360 par => [], 2660 par => [],
2361 height => 0, 2661 height => 0,
2362 children => [ 2662 children => [
2363 (new CFClient::UI::Empty expand => 1), 2663 (new CFClient::UI::Empty expand => 1),
2364 (new CFClient::UI::Slider vertical => 1), 2664 (new CFClient::UI::Slider vertical => 1),
… …
2375 2675
2376 $self->{fontsize} = $fontsize; 2676 $self->{fontsize} = $fontsize;
2377 $self->reflow; 2677 $self->reflow;
2378} 2678}
2379 2679
2680sub size_request {
2681 my ($self) = @_;
2682
2683 my ($empty, $slider) = @{ $self->{children} };
2684
2685 local $self->{children} = [$empty, $slider];
2686 $self->SUPER::size_request
2687}
2688
2380sub size_allocate { 2689sub invoke_size_allocate {
2381 my ($self, $w, $h) = @_; 2690 my ($self, $w, $h) = @_;
2382 2691
2383 $self->SUPER::size_allocate ($w, $h); 2692 my ($empty, $slider, @other) = @{ $self->{children} };
2693 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2384 2694
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2695 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2696 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2697 $self->{layout}->set_width ($empty->{w});
2698 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2699
2389 $self->reflow; 2700 $self->reflow;
2390}
2391 2701
2392sub text_size { 2702 local $self->{children} = [$empty, $slider];
2703 $self->SUPER::invoke_size_allocate ($w, $h)
2704}
2705
2706sub invoke_mouse_wheel {
2393 my ($self, $text, $indent) = @_; 2707 my ($self, $ev) = @_;
2708
2709 return 0 unless $ev->{dy}; # only vertical movements
2710
2711 $self->{children}[1]->emit (mouse_wheel => $ev);
2712
2713 1
2714}
2715
2716sub get_layout {
2717 my ($self, $para) = @_;
2394 2718
2395 my $layout = $self->{layout}; 2719 my $layout = $self->{layout};
2396 2720
2721 $layout->set_font ($self->{font}) if $self->{font};
2722 $layout->set_foreground (@{$para->{fg}});
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2723 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2724 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2725 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2726 $layout->set_markup ($para->{markup});
2727
2728 $layout->set_shapes (
2729 map
2730 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2731 @{$para->{widget}}
2400 2732 );
2733
2401 $layout->size 2734 $layout
2402} 2735}
2403 2736
2404sub reflow { 2737sub reflow {
2405 my ($self) = @_; 2738 my ($self) = @_;
2406 2739
… …
2415 $self->{children}[1]->set_value ($offset); 2748 $self->{children}[1]->set_value ($offset);
2416} 2749}
2417 2750
2418sub clear { 2751sub clear {
2419 my ($self) = @_; 2752 my ($self) = @_;
2753
2754 my (undef, undef, @other) = @{ $self->{children} };
2755 $self->remove ($_) for @other;
2420 2756
2421 $self->{par} = []; 2757 $self->{par} = [];
2422 $self->{height} = 0; 2758 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2759 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424} 2760}
2425 2761
2426sub add_paragraph { 2762sub add_paragraph {
2427 my ($self, $color, $text, $indent) = @_; 2763 my ($self, $color, $para, $indent) = @_;
2428 2764
2429 for my $line (split /\n/, $text) { 2765 my ($text, @w) = ref $para ? @$para : $para;
2430 my ($w, $h) = $self->text_size ($line); 2766
2431 $self->{height} += $h; 2767 $para = {
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2768 w => 1e10,
2769 wrapped => 1,
2770 fg => $color,
2771 indent => $indent,
2772 markup => $text,
2773 widget => \@w,
2433 } 2774 };
2434 2775
2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2776 $self->add (@w) if @w;
2777 push @{$self->{par}}, $para;
2778
2779 $self->{need_reflow}++;
2780 $self->update;
2781}
2782
2783sub scroll_to_bottom {
2784 my ($self) = @_;
2785
2786 $self->{scroll_to_bottom} = 1;
2787 $self->update;
2436} 2788}
2437 2789
2438sub update { 2790sub update {
2439 my ($self) = @_; 2791 my ($self) = @_;
2440 2792
… …
2442 2794
2443 return unless $self->{h} > 0; 2795 return unless $self->{h} > 0;
2444 2796
2445 delete $self->{texture}; 2797 delete $self->{texture};
2446 2798
2447 $ROOT->on_post_alloc ($self, sub { 2799 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2800 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2801
2450 if (delete $self->{need_reflow}) { 2802 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2803 my $height = 0;
2452 2804
2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457 for (@{$self->{par}}) { 2805 for my $para (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2806 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2459 $layout->set_width ($W - $_->[3]); 2807 my $layout = $self->get_layout ($para);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2808 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2809
2463 $_->[1] = $h; 2810 $para->{w} = $w + $para->{indent};
2811 $para->{h} = $h;
2812 $para->{wrapped} = $layout->has_wrapped;
2464 } 2813 }
2465 2814
2466 $height += $_->[1]; 2815 $height += $para->{h};
2467 } 2816 }
2468 2817
2469 $self->{height} = $height; 2818 $self->{height} = $height;
2470 2819
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2820 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2472 2821
2473 delete $self->{texture}; 2822 delete $self->{texture};
2474 } 2823 }
2475 2824
2825 if (delete $self->{scroll_to_bottom}) {
2826 $self->{children}[1]->set_value (1e10);
2827 }
2828
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2829 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2830 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2831 glClear GL_COLOR_BUFFER_BIT;
2479 2832
2480 my $top = int $self->{children}[1]{range}[0]; 2833 my $top = int $self->{children}[1]{range}[0];
2481 2834
2482 my $y0 = $top; 2835 my $y0 = $top;
2483 my $y1 = $top + $H; 2836 my $y1 = $top + $H;
2484 2837
2485 my $y = 0; 2838 my $y = 0;
2486 2839
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490
2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494
2495 for my $par (@{$self->{par}}) { 2840 for my $para (@{$self->{par}}) {
2496 my $h = $par->[1]; 2841 my $h = $para->{h};
2497 2842
2498 if ($y0 < $y + $h && $y < $y1) { 2843 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2501 $layout->set_markup ($par->[4]);
2502 2844
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2845 my $layout = $self->get_layout ($para);
2504 2846
2505 glRasterPos $par->[3], $y - $y0; 2847 $layout->render ($para->{indent}, $y - $y0);
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2848
2849 if (my @w = @{ $para->{widget} }) {
2850 my @s = $layout->get_shapes;
2851
2852 for (@w) {
2853 my ($dx, $dy) = splice @s, 0, 2, ();
2854
2855 $_->{x} = $dx + $para->{indent};
2856 $_->{y} = $dy + $y - $y0;
2857
2858 $_->draw;
2859 }
2860 }
2507 } 2861 }
2508 2862
2509 $y += $h; 2863 $y += $h;
2510 } 2864 }
2511
2512 glDisable GL_BLEND;
2513 }; 2865 };
2514 }); 2866 });
2515} 2867}
2516 2868
2869sub reconfigure {
2870 my ($self) = @_;
2871
2872 $self->SUPER::reconfigure;
2873
2874 $_->{w} = 1e10 for @{ $self->{par} };
2875 $self->reflow;
2876}
2877
2517sub _draw { 2878sub _draw {
2518 my ($self) = @_; 2879 my ($self) = @_;
2519 2880
2520 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2884 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2525 2886
2526 $self->{children}[1]->draw; 2887 $self->{children}[1]->draw;
2527
2528} 2888}
2529 2889
2530############################################################################# 2890#############################################################################
2531 2891
2532package CFClient::UI::Animator; 2892package CFClient::UI::Animator;
… …
2611} 2971}
2612 2972
2613sub set_tooltip_from { 2973sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2974 my ($self, $widget) = @_;
2615 2975
2976 my $tooltip = $widget->{tooltip};
2977
2978 if ($ENV{CFPLUS_DEBUG} & 2) {
2979 $tooltip .= "\n\n" . (ref $widget) . "\n"
2980 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2981 . "req $widget->{req_w} $widget->{req_h}\n"
2982 . "visible $widget->{visible}";
2983 }
2984
2985 $tooltip =~ s/^\n+//;
2986 $tooltip =~ s/\n+$//;
2987
2616 $self->add (new CFClient::UI::Label 2988 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2989 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2990 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2991 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2992 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2993 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2994 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3001 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630 3002
2631 ($w + 4, $h + 4) 3003 ($w + 4, $h + 4)
2632} 3004}
2633 3005
2634sub size_allocate { 3006sub invoke_size_allocate {
2635 my ($self, $w, $h) = @_; 3007 my ($self, $w, $h) = @_;
2636 3008
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 3009 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3010}
3011
3012sub invoke_visibility_change {
3013 my ($self, $visible) = @_;
3014
3015 return unless $visible;
3016
3017 $self->{root}->on_post_alloc ("move_$self" => sub {
3018 my $widget = $self->{owner}
3019 or return;
3020
3021 if ($widget->{visible}) {
3022 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3023
3024 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3025 if $x + $self->{w} > $self->{root}{w};
3026
3027 $self->move_abs ($x, $y);
3028 } else {
3029 $self->hide;
3030 }
3031 });
2638} 3032}
2639 3033
2640sub _draw { 3034sub _draw {
2641 my ($self) = @_; 3035 my ($self) = @_;
2642 3036
… …
2659 glVertex $w, $h; 3053 glVertex $w, $h;
2660 glVertex $w, 0; 3054 glVertex $w, 0;
2661 glEnd; 3055 glEnd;
2662 3056
2663 glTranslate 2 - 0.375, 2 - 0.375; 3057 glTranslate 2 - 0.375, 2 - 0.375;
3058
2664 $self->SUPER::_draw; 3059 $self->SUPER::_draw;
2665} 3060}
2666 3061
2667############################################################################# 3062#############################################################################
2668 3063
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3122 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 3123
2729 if ($tex) { 3124 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 3125 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3126 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 3127 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3128 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 3129 glDisable GL_TEXTURE_2D;
2735 } 3130 }
2736} 3131}
2737 3132
2738sub DESTROY { 3133sub destroy {
2739 my ($self) = @_; 3134 my ($self) = @_;
2740 3135
2741 $self->{timer}->cancel 3136 $self->{timer}->cancel
2742 if $self->{timer}; 3137 if $self->{timer};
2743 3138
2744 $self->SUPER::DESTROY; 3139 $self->SUPER::destroy;
2745} 3140}
2746 3141
2747############################################################################# 3142#############################################################################
2748 3143
2749package CFClient::UI::Inventory; 3144package CFClient::UI::Buttonbar;
2750 3145
2751our @ISA = CFClient::UI::ScrolledWindow::; 3146our @ISA = CFClient::UI::HBox::;
2752 3147
2753sub new { 3148# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 3149
2789############################################################################# 3150#############################################################################
2790 3151
2791package CFClient::UI::Menu; 3152package CFClient::UI::Menu;
2792 3153
… …
2804 ); 3165 );
2805 3166
2806 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3167 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2807 3168
2808 for my $item (@{ $self->{items} }) { 3169 for my $item (@{ $self->{items} }) {
2809 my ($widget, $cb) = @$item; 3170 my ($widget, $cb, $tooltip) = @$item;
2810 3171
2811 # handle various types of items, only text for now 3172 # handle various types of items, only text for now
2812 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 {
2813 $widget = new CFClient::UI::Label 3188 $widget = new CFClient::UI::Label
2814 can_hover => 1, 3189 can_hover => 1,
2815 can_events => 1, 3190 can_events => 1,
2816 text => $widget; 3191 markup => $widget,
3192 tooltip => $tooltip;
3193 }
2817 } 3194 }
2818 3195
2819 $self->{item}{$widget} = $item; 3196 $self->{item}{$widget} = $item;
2820 3197
2821 $self->{vbox}->add ($widget); 3198 $self->{vbox}->add ($widget);
… …
2826 3203
2827# 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)
2828sub popup { 3205sub popup {
2829 my ($self, $ev) = @_; 3206 my ($self, $ev) = @_;
2830 3207
2831 $self->_emit ("popdown"); 3208 $self->emit ("popdown");
2832 3209
2833 # maybe save $GRAB? must be careful about events... 3210 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 3211 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 3212 $self->{button} = $ev->{button};
2836 3213
2837 $self->show; 3214 $self->show;
2838 $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);
2839} 3216}
2840 3217
2841sub mouse_motion { 3218sub invoke_mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 3219 my ($self, $ev, $x, $y) = @_;
2843 3220
2844 # TODO: should use vbox->find_widget or so 3221 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3222 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 3223 $self->{hover} = $self->{item}{$HOVER};
2847}
2848 3224
3225 0
3226}
3227
2849sub button_up { 3228sub invoke_button_up {
2850 my ($self, $ev, $x, $y) = @_; 3229 my ($self, $ev, $x, $y) = @_;
2851 3230
2852 if ($ev->{button} == $self->{button}) { 3231 if ($ev->{button} == $self->{button}) {
2853 undef $GRAB; 3232 undef $GRAB;
2854 $self->hide; 3233 $self->hide;
2855 3234
2856 $self->_emit ("popdown"); 3235 $self->emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 3236 $self->{hover}[1]->() if $self->{hover};
3237 } else {
3238 return 0
3239 }
3240
2858 } 3241 1
2859} 3242}
2860 3243
2861############################################################################# 3244#############################################################################
2862 3245
2863package CFClient::UI::Statusbox; 3246package CFClient::UI::Multiplexer;
2864 3247
2865our @ISA = CFClient::UI::VBox::; 3248our @ISA = CFClient::UI::Container::;
2866 3249
2867sub new { 3250sub new {
2868 my $class = shift; 3251 my $class = shift;
2869 3252
2870 $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::Combobox;
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 (
2871 fontsize => 0.8, 3432 fontsize => 0.8,
2872 @_, 3433 @_,
2873 ) 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
2874} 3441}
2875 3442
2876sub reorder { 3443sub reorder {
2877 my ($self) = @_; 3444 my ($self) = @_;
2878 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} };
2879 3451
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3452 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3453 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3454 }
2883 3455
… …
2886 my @items = sort { 3458 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3459 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3460 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3461 } values %{ $self->{item} };
2890 3462
3463 $self->{timer}->interval (1);
3464
2891 my $count = 10 + 1; 3465 my $count = 10 + 1;
2892 for my $item (@items) { 3466 for my $item (@items) {
2893 last unless --$count; 3467 last unless --$count;
2894 3468
2895 push @widgets, $item->{label} ||= do { 3469 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3470 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3471 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3472 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3473 : $item->{text};
2900 3474
… …
2908 tooltip => $item->{tooltip}, 3482 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3483 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3484 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3485 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3486 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3487 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3488 can_events => 1,
2915 can_hover => 1 3489 can_hover => 1
2916 }; 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;
2917 } 3503 }
2918 3504
2919 $self->clear; 3505 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3506 $self->SUPER::add (reverse @widgets);
2921} 3507}
… …
2926 $text =~ s/^\s+//; 3512 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3513 $text =~ s/\s+$//;
2928 3514
2929 return unless $text; 3515 return unless $text;
2930 3516
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3517 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3518
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3519 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3520
2935 if (my $item = $self->{item}{$group}) { 3521 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3522 if ($item->{text} eq $text) {
2937 $item->{count}++; 3523 $item->{count}++;
2938 } else { 3524 } else {
2939 $item->{count} = 1; 3525 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text; 3526 $item->{text} = $item->{tooltip} = $text;
2941 } 3527 }
2942 $item->{id} = ++$self->{id}; 3528 $item->{id} += 0.2;#d#
2943 $item->{timeout} = $timeout; 3529 $item->{timeout} = $timeout;
2944 delete $item->{label}; 3530 delete $item->{label};
2945 } else { 3531 } else {
2946 $self->{item}{$group} = { 3532 $self->{item}{$group} = {
2947 id => ++$self->{id}, 3533 id => ++$self->{id},
… …
2953 count => 1, 3539 count => 1,
2954 %arg, 3540 %arg,
2955 }; 3541 };
2956 } 3542 }
2957 3543
3544 $ROOT->on_refresh (reorder => sub {
2958 $self->reorder; 3545 $self->reorder;
3546 });
2959} 3547}
2960 3548
2961sub reconfigure { 3549sub reconfigure {
2962 my ($self) = @_; 3550 my ($self) = @_;
2963 3551
… …
2966 3554
2967 $self->reorder; 3555 $self->reorder;
2968 $self->SUPER::reconfigure; 3556 $self->SUPER::reconfigure;
2969} 3557}
2970 3558
3559sub destroy {
3560 my ($self) = @_;
3561
3562 $self->{timer}->cancel;
3563
3564 $self->SUPER::destroy;
3565}
3566
2971############################################################################# 3567#############################################################################
2972 3568
2973package CFClient::UI::Root; 3569package CFClient::UI::Inventory;
2974 3570
2975our @ISA = CFClient::UI::Container::; 3571our @ISA = CFClient::UI::Table::;
2976
2977use CFClient::OpenGL;
2978 3572
2979sub new { 3573sub new {
2980 my $class = shift; 3574 my $class = shift;
2981 3575
2982 $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 (
2983 visible => 1, 3765 visible => 1,
2984 @_, 3766 @_,
2985 ) 3767 );
2986}
2987 3768
2988sub configure { 3769 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3770
2991 $self->{w} = $w; 3771 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3772}
3001 3773
3002sub size_request { 3774sub size_request {
3003 my ($self) = @_; 3775 my ($self) = @_;
3004 3776
3005 ($self->{w}, $self->{h}) 3777 ($self->{w}, $self->{h})
3006} 3778}
3007 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
3008sub size_allocate { 3794sub invoke_size_allocate {
3009 my ($self, $w, $h) = @_; 3795 my ($self, $w, $h) = @_;
3010 3796
3011 for my $child ($self->children) { 3797 for my $child ($self->children) {
3012 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)};
3013 3799
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3800 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3801 $Y = $child->{force_y} if exists $child->{force_y};
3016 3802
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3803 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3804 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3805
3025 $child->configure ($X, $Y, $W, $H); 3806 $child->configure ($X, $Y, $W, $H);
3026 } 3807 }
3808
3809 1
3027} 3810}
3028 3811
3029sub coord2local { 3812sub coord2local {
3030 my ($self, $x, $y) = @_; 3813 my ($self, $x, $y) = @_;
3031 3814
… …
3039} 3822}
3040 3823
3041sub update { 3824sub update {
3042 my ($self) = @_; 3825 my ($self) = @_;
3043 3826
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3827 $::WANT_REFRESH++;
3046} 3828}
3047 3829
3048sub add { 3830sub add {
3049 my ($self, @children) = @_; 3831 my ($self, @children) = @_;
3050 3832
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3833 $_->{is_toplevel} = 1
3053 3834 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3835
3059 $self->SUPER::add (@children); 3836 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3837}
3067 3838
3068sub remove { 3839sub remove {
3069 my ($self, @children) = @_; 3840 my ($self, @children) = @_;
3070 3841
3071 $self->SUPER::remove (@children); 3842 $self->SUPER::remove (@children);
3843
3844 delete $self->{is_toplevel}
3845 for @children;
3072 3846
3073 while (@children) { 3847 while (@children) {
3074 my $w = pop @children; 3848 my $w = pop @children;
3075 push @children, $w->children; 3849 push @children, $w->children;
3076 $w->set_invisible; 3850 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3869 while ($self->{refresh_hook}) {
3096 $_->() 3870 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3871 for values %{delete $self->{refresh_hook}};
3098 } 3872 }
3099 3873
3100 if ($self->{check_size}) { 3874 if ($self->{realloc}) {
3875 my %queue;
3101 my @queue; 3876 my @queue;
3877 my $widget;
3102 3878
3879 outer:
3103 while () { 3880 while () {
3104 if ($self->{check_size}) { 3881 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3882 for $widget (values %$realloc) {
3883 $widget->{visible} or next; # do not resize invisible widgets
3106 3884
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3885 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3886
3887 push @{ $queue[$widget->{visible}] }, $widget;
3888 }
3109 } 3889 }
3110 3890
3891 while () {
3892 @queue or last outer;
3893
3111 my $widget = pop @queue || last; 3894 $widget = pop @{ $queue[-1] || [] }
3112 3895 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 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}) {
3123 $widget->{req_w} = $w; 3915 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3916 $widget->{req_h} = $h;
3125 3917
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3918 $self->{size_alloc}{$widget+0} = $widget;
3127 3919
3128 $widget->{parent}->check_size
3129 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 }
3130 } 3927 }
3928
3929 delete $self->{realloc}{$widget+0};
3131 } 3930 }
3132 } 3931 }
3133 3932
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3933 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3934 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3935 values %$size_alloc;
3137 3936
3138 while () { 3937 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3938 my $widget = pop @queue || last;
3939
3940 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3941
3141 $w = 0 if $w < 0; 3942 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3943 $h = 0 if $h < 0;
3143 3944
3945 $w = max $widget->{min_w}, $w;
3946 $h = max $widget->{min_h}, $h;
3947
3948 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950
3951 $w = int $w + 0.5;
3952 $h = int $h + 0.5;
3953
3954 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3955 $widget->{old_w} = $widget->{w};
3956 $widget->{old_h} = $widget->{h};
3957
3144 $widget->{w} = $w; 3958 $widget->{w} = $w;
3145 $widget->{h} = $h; 3959 $widget->{h} = $h;
3960
3146 $widget->emit (size_allocate => $w, $h); 3961 $widget->emit (size_allocate => $w, $h);
3962 }
3147 } 3963 }
3148 } 3964 }
3149 3965
3150 while ($self->{post_alloc_hook}) { 3966 while ($self->{post_alloc_hook}) {
3151 $_->() 3967 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3968 for values %{delete $self->{post_alloc_hook}};
3153 } 3969 }
3970
3154 3971
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3972 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3973 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3974 glClear GL_COLOR_BUFFER_BIT;
3158 3975
… …
3160 glLoadIdentity; 3977 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3978 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3979 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3980 glLoadIdentity;
3164 3981
3982 {
3983 package CFClient::UI::Base;
3984
3985 ($draw_x, $draw_y, $draw_w, $draw_h) =
3986 (0, 0, $self->{w}, $self->{h});
3987 }
3988
3165 $self->_draw; 3989 $self->_draw;
3166} 3990}
3167 3991
3168############################################################################# 3992#############################################################################
3169 3993

Diff Legend

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