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

Diff Legend

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