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

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

Diff Legend

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