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

Diff Legend

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