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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.336 by root, Sun Jul 23 16:46:06 2006 UTC

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

Diff Legend

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