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

Diff Legend

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