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.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC

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

Diff Legend

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