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

Diff Legend

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