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.373 by root, Sun Jul 15 22:39:30 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 scroll_x => 0,
1067 scroll_y => 1,
1068 can_events => 1,
922 slider => $slider, 1069 hslider => $hslider,
923 @_, 1070 vslider => $vslider,
1071 col_expand => [1, 0],
1072 row_expand => [1, 0],
1073 %arg,
924 ); 1074 );
925 1075
926 $self->{vp}->add ($self->{scrolled}); 1076 $self->{vp} = new CFPlus::UI::ViewPort
1077 expand => 1,
1078 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y},
1080 ;
1081
927 $self->add ($self->{vp}); 1082 $self->SUPER::add (0, 0, $self->{vp});
928 $self->add ($self->{slider}); 1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085
1086 $self->add ($child) if $child;
929 1087
930 $self 1088 $self
931} 1089}
932 1090
1091#TODO# update range on size_allocate depending on child
1092
1093sub add {
1094 my ($self, $widget) = @_;
1095
1096 $self->{vp}->add ($self->{child} = $widget);
1097}
1098
1099sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_;
1101
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $self->{vslider}->emit (mouse_wheel => $ev);
1105
1106 1
1107}
1108
1109sub update_slider {
1110 my ($self) = @_;
1111
1112 my $child = ($self->{vp} or return)->child;
1113
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121}
1122
933sub update { 1123sub update {
934 my ($self) = @_; 1124 my ($self) = @_;
935 1125
936 $self->SUPER::update; 1126 $self->SUPER::update;
937 1127 $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} 1128}
942 1129
943sub size_allocate { 1130sub invoke_size_allocate {
944 my ($self, $w, $h) = @_; 1131 my ($self, $w, $h) = @_;
945 1132
1133 $self->update_slider;
946 $self->SUPER::size_allocate ($w, $h); 1134 $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} 1135}
951
952#TODO# update range on size_allocate depending on child
953# update viewport offset on scroll
954 1136
955############################################################################# 1137#############################################################################
956 1138
957package CFClient::UI::Frame; 1139package CFPlus::UI::Frame;
958 1140
959our @ISA = CFClient::UI::Bin::; 1141our @ISA = CFPlus::UI::Bin::;
960 1142
961use CFClient::OpenGL; 1143use CFPlus::OpenGL;
962 1144
963sub new { 1145sub new {
964 my $class = shift; 1146 my $class = shift;
965 1147
966 $class->SUPER::new ( 1148 $class->SUPER::new (
… …
974 1156
975 if ($self->{bg}) { 1157 if ($self->{bg}) {
976 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
977 1159
978 glEnable GL_BLEND; 1160 glEnable GL_BLEND;
979 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1161 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
980 glColor @{ $self->{bg} }; 1162 glColor_premultiply @{ $self->{bg} };
981 1163
982 glBegin GL_QUADS; 1164 glBegin GL_QUADS;
983 glVertex 0 , 0; 1165 glVertex 0 , 0;
984 glVertex 0 , $h; 1166 glVertex 0 , $h;
985 glVertex $w, $h; 1167 glVertex $w, $h;
… …
992 $self->SUPER::_draw; 1174 $self->SUPER::_draw;
993} 1175}
994 1176
995############################################################################# 1177#############################################################################
996 1178
997package CFClient::UI::FancyFrame; 1179package CFPlus::UI::FancyFrame;
998 1180
999our @ISA = CFClient::UI::Bin::; 1181our @ISA = CFPlus::UI::Bin::;
1000 1182
1001use CFClient::OpenGL; 1183use 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 1184
1007sub new { 1185sub new {
1008 my $class = shift; 1186 my ($class, %arg) = @_;
1187
1188 if ((exists $arg{label}) && !ref $arg{label}) {
1189 $arg{label} = new CFPlus::UI::Label
1190 align => 1,
1191 valign => 0,
1192 text => $arg{label},
1193 fontsize => ($arg{border} || 0.8) * 0.75;
1194 }
1195
1196 my $self = $class->SUPER::new (
1197 # label => "",
1198 fg => [0.6, 0.3, 0.1],
1199 border => 0.8,
1200 style => 'single',
1201 %arg,
1202 );
1203
1204 $self
1205}
1206
1207sub add {
1208 my ($self, @widgets) = @_;
1209
1210 $self->SUPER::add (@widgets);
1211 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1212}
1213
1214sub border {
1215 int $_[0]{border} * $::FONTSIZE
1216}
1217
1218sub size_request {
1219 my ($self) = @_;
1220
1221 ($self->{label_w}, undef) = $self->{label}->size_request
1222 if $self->{label};
1223
1224 my ($w, $h) = $self->SUPER::size_request;
1225
1226 (
1227 $w + $self->border * 2,
1228 $h + $self->border * 2,
1229 )
1230}
1231
1232sub invoke_size_allocate {
1233 my ($self, $w, $h) = @_;
1234
1235 my $border = $self->border;
1236
1237 $w -= List::Util::max 0, $border * 2;
1238 $h -= List::Util::max 0, $border * 2;
1239
1240 if (my $label = $self->{label}) {
1241 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1242 $label->{h} = List::Util::min $h, $border;
1243 $label->invoke_size_allocate ($label->{w}, $label->{h});
1244 }
1245
1246 $self->child->configure ($border, $border, $w, $h);
1247
1248 1
1249}
1250
1251sub _draw {
1252 my ($self) = @_;
1253
1254 my $child = $self->{children}[0];
1255
1256 my $border = $self->border;
1257 my ($w, $h) = ($self->{w}, $self->{h});
1258
1259 $child->draw;
1260
1261 glColor @{$self->{fg}};
1262 glBegin GL_LINE_STRIP;
1263 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1264 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1265 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1266 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1267 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1268 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1269 glEnd;
1270
1271 if ($self->{label}) {
1272 glTranslate $border * 2, 0;
1273 $self->{label}->_draw;
1274 }
1275}
1276
1277#############################################################################
1278
1279package CFPlus::UI::Toplevel;
1280
1281our @ISA = CFPlus::UI::Bin::;
1282
1283use CFPlus::OpenGL;
1284
1285my $bg =
1286 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1287 mipmap => 1, wrap => 1;
1288
1289my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1292
1293sub new {
1294 my ($class, %arg) = @_;
1009 1295
1010 my $self = $class->SUPER::new ( 1296 my $self = $class->SUPER::new (
1011 bg => [1, 1, 1, 1], 1297 bg => [1, 1, 1, 1],
1012 border_bg => [1, 1, 1, 1], 1298 border_bg => [1, 1, 1, 1],
1013 border => 0.6, 1299 border => 0.6,
1014 is_toplevel => 1,
1015 can_events => 1, 1300 can_events => 1,
1016 @_ 1301 min_w => 64,
1302 min_h => 32,
1303 %arg,
1017 ); 1304 );
1018 1305
1019 $self->{title} &&= new CFClient::UI::Label 1306 $self->{title_widget} = new CFPlus::UI::Label
1020 align => 0, 1307 align => 0,
1021 valign => 1, 1308 valign => 1,
1022 text => $self->{title}, 1309 text => $self->{title},
1023 fontsize => $self->{border}; 1310 fontsize => $self->{border},
1311 if exists $self->{title};
1312
1313 if ($self->{has_close_button}) {
1314 $self->{close_button} =
1315 new CFPlus::UI::ImageButton
1316 path => 'x1_close.png',
1317 on_activate => sub { $self->emit ("delete") };
1318
1319 $self->CFPlus::UI::Container::add ($self->{close_button});
1320 }
1024 1321
1025 $self 1322 $self
1323}
1324
1325sub add {
1326 my ($self, @widgets) = @_;
1327
1328 $self->SUPER::add (@widgets);
1329 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1330 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1026} 1331}
1027 1332
1028sub border { 1333sub border {
1029 int $_[0]{border} * $::FONTSIZE 1334 int $_[0]{border} * $::FONTSIZE
1030} 1335}
1031 1336
1032sub size_request { 1337sub size_request {
1033 my ($self) = @_; 1338 my ($self) = @_;
1339
1340 $self->{title_widget}->size_request
1341 if $self->{title_widget};
1342
1343 $self->{close_button}->size_request
1344 if $self->{close_button};
1034 1345
1035 my ($w, $h) = $self->SUPER::size_request; 1346 my ($w, $h) = $self->SUPER::size_request;
1036 1347
1037 ( 1348 (
1038 $w + $self->border * 2, 1349 $w + $self->border * 2,
1039 $h + $self->border * 2, 1350 $h + $self->border * 2,
1040 ) 1351 )
1041} 1352}
1042 1353
1043sub size_allocate { 1354sub invoke_size_allocate {
1044 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1045 1356
1357 if ($self->{title_widget}) {
1358 $self->{title_widget}{w} = $w;
1359 $self->{title_widget}{h} = $h;
1360 $self->{title_widget}->invoke_size_allocate ($w, $h);
1361 }
1362
1363 my $border = $self->border;
1364
1046 $h -= List::Util::max 0, $self->border * 2; 1365 $h -= List::Util::max 0, $border * 2;
1047 $w -= List::Util::max 0, $self->border * 2; 1366 $w -= List::Util::max 0, $border * 2;
1048 1367
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); 1368 $self->child->configure ($border, $border, $w, $h);
1053}
1054 1369
1370 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1371 if $self->{close_button};
1372
1373 1
1374}
1375
1376sub invoke_delete {
1377 my ($self) = @_;
1378
1379 $self->hide;
1380
1381 1
1382}
1383
1055sub button_down { 1384sub invoke_button_down {
1056 my ($self, $ev, $x, $y) = @_; 1385 my ($self, $ev, $x, $y) = @_;
1057 1386
1058 my ($w, $h) = @$self{qw(w h)}; 1387 my ($w, $h) = @$self{qw(w h)};
1059 my $border = $self->border; 1388 my $border = $self->border;
1060 1389
… …
1073 my ($ev, $x, $y) = @_; 1402 my ($ev, $x, $y) = @_;
1074 1403
1075 my $dx = $ev->{x} - $ox; 1404 my $dx = $ev->{x} - $ox;
1076 my $dy = $ev->{y} - $oy; 1405 my $dy = $ev->{y} - $oy;
1077 1406
1078 $self->{user_x} = $wx + $dx * $mx;
1079 $self->{user_y} = $wy + $dy * $my;
1080 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1407 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1081 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1408 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1082 $self->move ($self->{user_x}, $self->{user_y}); 1409
1083 $self->check_size; 1410 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1411 $self->realloc;
1084 }; 1412 };
1085 1413
1086 } elsif ($lr ^ $td) { 1414 } elsif ($lr ^ $td) {
1087 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1415 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1088 my ($bx, $by) = ($self->{x}, $self->{y}); 1416 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1090 $self->{motion} = sub { 1418 $self->{motion} = sub {
1091 my ($ev, $x, $y) = @_; 1419 my ($ev, $x, $y) = @_;
1092 1420
1093 ($x, $y) = ($ev->{x}, $ev->{y}); 1421 ($x, $y) = ($ev->{x}, $ev->{y});
1094 1422
1095 $self->{user_x} = $bx + $x - $ox; 1423 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1096 $self->{user_y} = $by + $y - $oy; 1424 # HACK: the next line is required to enforce placement
1097 1425 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1098 $self->move ($self->{user_x}, $self->{user_y});
1099 $self->update;
1100 }; 1426 };
1427 } else {
1428 return 0;
1429 }
1430
1101 } 1431 1
1102} 1432}
1103 1433
1104sub button_up { 1434sub invoke_button_up {
1105 my ($self, $ev, $x, $y) = @_; 1435 my ($self, $ev, $x, $y) = @_;
1106 1436
1107 delete $self->{motion}; 1437 ! ! delete $self->{motion}
1108} 1438}
1109 1439
1110sub mouse_motion { 1440sub invoke_mouse_motion {
1111 my ($self, $ev, $x, $y) = @_; 1441 my ($self, $ev, $x, $y) = @_;
1112 1442
1113 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1443 $self->{motion}->($ev, $x, $y) if $self->{motion};
1444
1445 ! ! $self->{motion}
1446}
1447
1448sub invoke_visibility_change {
1449 my ($self, $visible) = @_;
1450
1451 delete $self->{motion} unless $visible;
1452
1453 0
1114} 1454}
1115 1455
1116sub _draw { 1456sub _draw {
1117 my ($self) = @_; 1457 my ($self) = @_;
1118 1458
1459 my $child = $self->{children}[0];
1460
1119 my ($w, $h ) = ($self->{w}, $self->{h}); 1461 my ($w, $h ) = ($self->{w}, $self->{h});
1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1462 my ($cw, $ch) = ($child->{w}, $child->{h});
1121 1463
1122 glEnable GL_TEXTURE_2D; 1464 glEnable GL_TEXTURE_2D;
1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1124 1466
1125 my $border = $self->border; 1467 my $border = $self->border;
1126 1468
1127 glColor @{ $self->{border_bg} }; 1469 glColor @{ $self->{border_bg} };
1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1470 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1473 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1132 1474
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1134 my $bg = $tex[0]; 1476 glColor @{ $self->{bg} };
1135 1477
1136 # TODO: repeat texture not scale 1478 # TODO: repeat texture not scale
1479 # solve this better(?)
1137 my $rep_x = $cw / $bg->{w}; 1480 $bg->{s} = $cw / $bg->{w};
1138 my $rep_y = $ch / $bg->{h}; 1481 $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); 1482 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 } 1483 }
1147 1484
1148 glDisable GL_TEXTURE_2D; 1485 glDisable GL_TEXTURE_2D;
1149 1486
1150 $self->{title}->draw if $self->{title};
1151
1152 $self->child->draw; 1487 $child->draw;
1488
1489 if ($self->{title_widget}) {
1490 glTranslate 0, $border - $self->{h};
1491 $self->{title_widget}->_draw;
1492
1493 glTranslate 0, - ($border - $self->{h});
1494 }
1495
1496 $self->{close_button}->draw
1497 if $self->{close_button};
1153} 1498}
1154 1499
1155############################################################################# 1500#############################################################################
1156 1501
1157package CFClient::UI::Table; 1502package CFPlus::UI::Table;
1158 1503
1159our @ISA = CFClient::UI::Base::; 1504our @ISA = CFPlus::UI::Base::;
1160 1505
1161use List::Util qw(max sum); 1506use List::Util qw(max sum);
1162 1507
1163use CFClient::OpenGL; 1508use CFPlus::OpenGL;
1164 1509
1165sub new { 1510sub new {
1166 my $class = shift; 1511 my $class = shift;
1167 1512
1168 $class->SUPER::new ( 1513 $class->SUPER::new (
1169 col_expand => [], 1514 col_expand => [],
1515 row_expand => [],
1170 @_, 1516 @_,
1171 ) 1517 )
1172} 1518}
1173 1519
1174sub children { 1520sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1176} 1522}
1177 1523
1178sub add { 1524sub add {
1179 my ($self, $x, $y, $child) = @_; 1525 my ($self) = shift;
1180 1526
1527 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, ();
1181 $child->set_parent ($self); 1529 $child->set_parent ($self);
1182 $self->{children}[$y][$x] = $child; 1530 $self->{children}[$y][$x] = $child;
1531 }
1183 1532
1184 $self->check_size (1); 1533 $self->{force_realloc} = 1;
1534 $self->{force_size_alloc} = 1;
1535 $self->realloc;
1536}
1537
1538sub remove {
1539 my ($self, $child) = @_;
1540
1541 # TODO: not yet implemented
1185} 1542}
1186 1543
1187# TODO: move to container class maybe? send children a signal on removal? 1544# TODO: move to container class maybe? send children a signal on removal?
1188sub clear { 1545sub clear {
1189 my ($self) = @_; 1546 my ($self) = @_;
… …
1194 for (@children) { 1551 for (@children) {
1195 delete $_->{parent}; 1552 delete $_->{parent};
1196 $_->hide; 1553 $_->hide;
1197 } 1554 }
1198 1555
1199 $self->check_size (1); 1556 $self->realloc;
1200 $self->update;
1201} 1557}
1202 1558
1203sub get_wh { 1559sub get_wh {
1204 my ($self) = @_; 1560 my ($self) = @_;
1205 1561
… …
1231 (sum @$ws), 1587 (sum @$ws),
1232 (sum @$hs), 1588 (sum @$hs),
1233 ) 1589 )
1234} 1590}
1235 1591
1236sub size_allocate { 1592sub invoke_size_allocate {
1237 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1238 1594
1239 my ($ws, $hs) = $self->get_wh; 1595 my ($ws, $hs) = $self->get_wh;
1240 1596
1241 my $req_w = (sum @$ws) || 1; 1597 my $req_w = (sum @$ws) || 1;
1242 my $req_h = (sum @$hs) || 1; 1598 my $req_h = (sum @$hs) || 1;
1243 1599
1244 # TODO: nicer code && do row_expand 1600 # TODO: nicer code
1245 my @col_expand = @{$self->{col_expand}}; 1601 my @col_expand = @{$self->{col_expand}};
1246 @col_expand = (1) x @$ws unless @col_expand; 1602 @col_expand = (1) x @$ws unless @col_expand;
1247 my $col_expand = (sum @col_expand) || 1; 1603 my $col_expand = (sum @col_expand) || 1;
1248 1604
1249 # linearly scale sizes
1250 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1251 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1252 1606
1253 CFClient::UI::harmonize $ws; 1607 CFPlus::UI::harmonize $ws;
1608
1609 my @row_expand = @{$self->{row_expand}};
1610 @row_expand = (1) x @$ws unless @row_expand;
1611 my $row_expand = (sum @row_expand) || 1;
1612
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614
1254 CFClient::UI::harmonize $hs; 1615 CFPlus::UI::harmonize $hs;
1255 1616
1256 my $y; 1617 my $y;
1257 1618
1258 for my $r (0 .. $#{$self->{children}}) { 1619 for my $r (0 .. $#{$self->{children}}) {
1259 my $row = $self->{children}[$r] 1620 my $row = $self->{children}[$r]
… …
1273 } 1634 }
1274 1635
1275 $y += $row_h; 1636 $y += $row_h;
1276 } 1637 }
1277 1638
1639 1
1278} 1640}
1279 1641
1280sub find_widget { 1642sub find_widget {
1281 my ($self, $x, $y) = @_; 1643 my ($self, $x, $y) = @_;
1282 1644
… …
1301 } 1663 }
1302} 1664}
1303 1665
1304############################################################################# 1666#############################################################################
1305 1667
1306package CFClient::UI::Box; 1668package CFPlus::UI::Box;
1307 1669
1308our @ISA = CFClient::UI::Container::; 1670our @ISA = CFPlus::UI::Container::;
1309 1671
1310sub size_request { 1672sub size_request {
1311 my ($self) = @_; 1673 my ($self) = @_;
1312 1674
1313 $self->{vertical} 1675 $self->{vertical}
… …
1319 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1320 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1682 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1321 ) 1683 )
1322} 1684}
1323 1685
1324sub size_allocate { 1686sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1687 my ($self, $w, $h) = @_;
1326 1688
1327 my $space = $self->{vertical} ? $h : $w; 1689 my $space = $self->{vertical} ? $h : $w;
1328 my $children = $self->{children}; 1690 my @children = $self->visible_children;
1329 1691
1330 my @req; 1692 my @req;
1331 1693
1332 if ($self->{homogeneous}) { 1694 if ($self->{homogeneous}) {
1333 @req = ($space / (@$children || 1)) x @$children; 1695 @req = ($space / (@children || 1)) x @children;
1334 } else { 1696 } else {
1335 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1697 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1336 my $req = List::Util::sum @req; 1698 my $req = List::Util::sum @req;
1337 1699
1338 if ($req > $space) { 1700 if ($req > $space) {
1339 # ah well, not enough space 1701 # ah well, not enough space
1340 $_ *= $space / $req for @req; 1702 $_ *= $space / $req for @req;
1341 } else { 1703 } else {
1342 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1704 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1343 1705
1344 $space = ($space - $req) / $expand; # remaining space to give away 1706 $space = ($space - $req) / $expand; # remaining space to give away
1345 1707
1346 $req[$_] += $space * $children->[$_]{expand} 1708 $req[$_] += $space * $children[$_]{expand}
1347 for 0 .. $#$children; 1709 for 0 .. $#children;
1348 } 1710 }
1349 } 1711 }
1350 1712
1351 CFClient::UI::harmonize \@req; 1713 CFPlus::UI::harmonize \@req;
1352 1714
1353 my $pos = 0; 1715 my $pos = 0;
1354 for (0 .. $#$children) { 1716 for (0 .. $#children) {
1355 my $alloc = $req[$_]; 1717 my $alloc = $req[$_];
1356 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1718 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1357 1719
1358 $pos += $alloc; 1720 $pos += $alloc;
1359 } 1721 }
1360 1722
1361 1 1723 1
1362} 1724}
1363 1725
1364############################################################################# 1726#############################################################################
1365 1727
1366package CFClient::UI::HBox; 1728package CFPlus::UI::HBox;
1367 1729
1368our @ISA = CFClient::UI::Box::; 1730our @ISA = CFPlus::UI::Box::;
1369 1731
1370sub new { 1732sub new {
1371 my $class = shift; 1733 my $class = shift;
1372 1734
1373 $class->SUPER::new ( 1735 $class->SUPER::new (
… …
1376 ) 1738 )
1377} 1739}
1378 1740
1379############################################################################# 1741#############################################################################
1380 1742
1381package CFClient::UI::VBox; 1743package CFPlus::UI::VBox;
1382 1744
1383our @ISA = CFClient::UI::Box::; 1745our @ISA = CFPlus::UI::Box::;
1384 1746
1385sub new { 1747sub new {
1386 my $class = shift; 1748 my $class = shift;
1387 1749
1388 $class->SUPER::new ( 1750 $class->SUPER::new (
… …
1391 ) 1753 )
1392} 1754}
1393 1755
1394############################################################################# 1756#############################################################################
1395 1757
1396package CFClient::UI::Label; 1758package CFPlus::UI::Label;
1397 1759
1398our @ISA = CFClient::UI::DrawBG::; 1760our @ISA = CFPlus::UI::DrawBG::;
1399 1761
1400use CFClient::OpenGL; 1762use CFPlus::OpenGL;
1401 1763
1402sub new { 1764sub new {
1403 my ($class, %arg) = @_; 1765 my ($class, %arg) = @_;
1404 1766
1405 my $self = $class->SUPER::new ( 1767 my $self = $class->SUPER::new (
… …
1408 #active_bg => none 1770 #active_bg => none
1409 #font => default_font 1771 #font => default_font
1410 #text => initial text 1772 #text => initial text
1411 #markup => initial narkup 1773 #markup => initial narkup
1412 #max_w => maximum pixel width 1774 #max_w => maximum pixel width
1775 #style => 0, # render flags
1413 ellipsise => 3, # end 1776 ellipsise => 3, # end
1414 layout => (new CFClient::Layout), 1777 layout => (new CFPlus::Layout),
1415 fontsize => 1, 1778 fontsize => 1,
1416 align => -1, 1779 align => -1,
1417 valign => -1, 1780 valign => -1,
1418 padding => 2, 1781 padding_x => 2,
1782 padding_y => 2,
1419 can_events => 0, 1783 can_events => 0,
1420 %arg 1784 %arg
1421 ); 1785 );
1422 1786
1423 if (exists $self->{template}) { 1787 if (exists $self->{template}) {
1424 my $layout = new CFClient::Layout; 1788 my $layout = new CFPlus::Layout;
1425 $layout->set_text (delete $self->{template}); 1789 $layout->set_text (delete $self->{template});
1426 $self->{template} = $layout; 1790 $self->{template} = $layout;
1427 } 1791 }
1428 1792
1429 if (exists $self->{markup}) { 1793 if (exists $self->{markup}) {
… …
1433 } 1797 }
1434 1798
1435 $self 1799 $self
1436} 1800}
1437 1801
1438sub escape($) {
1439 local $_ = $_[0];
1440
1441 s/&/&amp;/g;
1442 s/>/&gt;/g;
1443 s/</&lt;/g;
1444
1445 $_
1446}
1447
1448sub update { 1802sub update {
1449 my ($self) = @_; 1803 my ($self) = @_;
1450 1804
1451 delete $self->{texture}; 1805 delete $self->{texture};
1452 $self->SUPER::update; 1806 $self->SUPER::update;
1453} 1807}
1454 1808
1809sub realloc {
1810 my ($self) = @_;
1811
1812 delete $self->{ox};
1813 $self->SUPER::realloc;
1814}
1815
1455sub set_text { 1816sub set_text {
1456 my ($self, $text) = @_; 1817 my ($self, $text) = @_;
1457 1818
1458 return if $self->{text} eq "T$text"; 1819 return if $self->{text} eq "T$text";
1459 $self->{text} = "T$text"; 1820 $self->{text} = "T$text";
1460 1821
1461 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1462 $self->{layout}->set_text ($text); 1822 $self->{layout}->set_text ($text);
1463 1823
1824 delete $self->{size_req};
1825 $self->realloc;
1464 $self->update; 1826 $self->update;
1465 $self->check_size;
1466} 1827}
1467 1828
1468sub set_markup { 1829sub set_markup {
1469 my ($self, $markup) = @_; 1830 my ($self, $markup) = @_;
1470 1831
1471 return if $self->{text} eq "M$markup"; 1832 return if $self->{text} eq "M$markup";
1472 $self->{text} = "M$markup"; 1833 $self->{text} = "M$markup";
1473 1834
1474 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1835 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1475 1836
1476 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1477 $self->{layout}->set_markup ($markup); 1837 $self->{layout}->set_markup ($markup);
1478 1838
1839 delete $self->{size_req};
1840 $self->realloc;
1479 $self->update; 1841 $self->update;
1480 $self->check_size;
1481} 1842}
1482 1843
1483sub size_request { 1844sub size_request {
1484 my ($self) = @_; 1845 my ($self) = @_;
1485 1846
1847 $self->{size_req} ||= do {
1486 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1848 $self->{layout}->set_font ($self->{font}) if $self->{font};
1487 $self->{layout}->set_width ($self->{max_w} || -1); 1849 $self->{layout}->set_width ($self->{max_w} || -1);
1488 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1850 $self->{layout}->set_ellipsise ($self->{ellipsise});
1489 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1851 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1490 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1852 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1491 1853
1492 my ($w, $h) = $self->{layout}->size; 1854 my ($w, $h) = $self->{layout}->size;
1493 1855
1494 if (exists $self->{template}) { 1856 if (exists $self->{template}) {
1495 $self->{template}->set_font ($self->{font}) if $self->{font}; 1857 $self->{template}->set_font ($self->{font}) if $self->{font};
1858 $self->{template}->set_width ($self->{max_w} || -1);
1496 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1859 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1860
1498 my ($w2, $h2) = $self->{template}->size; 1861 my ($w2, $h2) = $self->{template}->size;
1499 1862
1500 $w = List::Util::max $w, $w2; 1863 $w = List::Util::max $w, $w2;
1501 $h = List::Util::max $h, $h2; 1864 $h = List::Util::max $h, $h2;
1865 }
1866
1867 [$w, $h]
1502 } 1868 };
1503 1869
1504 ( 1870 @{ $self->{size_req} }
1505 $w + $self->{padding} * 2,
1506 $h + $self->{padding} * 2,
1507 )
1508} 1871}
1509 1872
1873sub baseline_shift {
1874 $_[0]{layout}->descent
1875}
1876
1510sub size_allocate { 1877sub invoke_size_allocate {
1511 my ($self, $w, $h) = @_; 1878 my ($self, $w, $h) = @_;
1512 1879
1880 delete $self->{ox};
1881
1513 delete $self->{texture}; 1882 delete $self->{texture}
1883 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1884
1885 1
1514} 1886}
1515 1887
1516sub set_fontsize { 1888sub set_fontsize {
1517 my ($self, $fontsize) = @_; 1889 my ($self, $fontsize) = @_;
1518 1890
1519 $self->{fontsize} = $fontsize; 1891 $self->{fontsize} = $fontsize;
1892 delete $self->{size_req};
1520 delete $self->{texture}; 1893 delete $self->{texture};
1521 1894
1522 $self->update; 1895 $self->realloc;
1523 $self->check_size; 1896}
1897
1898sub reconfigure {
1899 my ($self) = @_;
1900
1901 delete $self->{size_req};
1902 delete $self->{texture};
1903
1904 $self->SUPER::reconfigure;
1524} 1905}
1525 1906
1526sub _draw { 1907sub _draw {
1527 my ($self) = @_; 1908 my ($self) = @_;
1528 1909
1529 $self->SUPER::_draw; # draw background, if applicable 1910 $self->SUPER::_draw; # draw background, if applicable
1530 1911
1531 my $tex = $self->{texture} ||= do { 1912 my $size = $self->{texture} ||= do {
1532 $self->{layout}->set_foreground (@{$self->{fg}}); 1913 $self->{layout}->set_foreground (@{$self->{fg}});
1533 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1914 $self->{layout}->set_font ($self->{font}) if $self->{font};
1534 $self->{layout}->set_width ($self->{w}); 1915 $self->{layout}->set_width ($self->{w});
1535 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1916 $self->{layout}->set_ellipsise ($self->{ellipsise});
1536 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1917 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1537 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1918 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1538 1919
1539 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1920 [$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 }; 1921 };
1551 1922
1552 glEnable GL_TEXTURE_2D; 1923 unless (exists $self->{ox}) {
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1924 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1925 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1926 : ($self->{w} - $size->[0]) * 0.5);
1554 1927
1555 if ($tex->{format} == GL_ALPHA) { 1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1556 glColor @{$self->{fg}}; 1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1557 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1930 : ($self->{h} - $size->[1]) * 0.5);
1558 } else {
1559 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1560 } 1931 };
1561 1932
1562 glDisable GL_TEXTURE_2D; 1933 my $w = List::Util::min $self->{w} + 4, $size->[0];
1934 my $h = List::Util::min $self->{h} + 2, $size->[1];
1935
1936 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1563} 1937}
1564 1938
1565############################################################################# 1939#############################################################################
1566 1940
1567package CFClient::UI::EntryBase; 1941package CFPlus::UI::EntryBase;
1568 1942
1569our @ISA = CFClient::UI::Label::; 1943our @ISA = CFPlus::UI::Label::;
1570 1944
1571use CFClient::OpenGL; 1945use CFPlus::OpenGL;
1572 1946
1573sub new { 1947sub new {
1574 my $class = shift; 1948 my $class = shift;
1575 1949
1576 $class->SUPER::new ( 1950 $class->SUPER::new (
… …
1580 active_fg => [0, 0, 0], 1954 active_fg => [0, 0, 0],
1581 can_hover => 1, 1955 can_hover => 1,
1582 can_focus => 1, 1956 can_focus => 1,
1583 valign => 0, 1957 valign => 0,
1584 can_events => 1, 1958 can_events => 1,
1959 ellipsise => 0,
1585 #text => ... 1960 #text => ...
1961 #hidden => "*",
1586 @_ 1962 @_
1587 ) 1963 )
1588} 1964}
1589 1965
1590sub _set_text { 1966sub _set_text {
… …
1592 1968
1593 delete $self->{cur_h}; 1969 delete $self->{cur_h};
1594 1970
1595 return if $self->{text} eq $text; 1971 return if $self->{text} eq $text;
1596 1972
1597 delete $self->{texture};
1598
1599 $self->{last_activity} = $::NOW; 1973 $self->{last_activity} = $::NOW;
1600 $self->{text} = $text; 1974 $self->{text} = $text;
1601 1975
1602 $text =~ s/./*/g if $self->{hidden}; 1976 $text =~ s/./*/g if $self->{hidden};
1603 $self->{layout}->set_text ("$text "); 1977 $self->{layout}->set_text ("$text ");
1978 delete $self->{size_req};
1604 1979
1605 $self->_emit (changed => $self->{text}); 1980 $self->emit (changed => $self->{text});
1981
1982 $self->realloc;
1983 $self->update;
1606} 1984}
1607 1985
1608sub set_text { 1986sub set_text {
1609 my ($self, $text) = @_; 1987 my ($self, $text) = @_;
1610 1988
1611 $self->{cursor} = length $text; 1989 $self->{cursor} = length $text;
1612 $self->_set_text ($text); 1990 $self->_set_text ($text);
1613 $self->update;
1614 $self->check_size;
1615} 1991}
1616 1992
1617sub get_text { 1993sub get_text {
1618 $_[0]{text} 1994 $_[0]{text}
1619} 1995}
… …
1624 my ($w, $h) = $self->SUPER::size_request; 2000 my ($w, $h) = $self->SUPER::size_request;
1625 2001
1626 ($w + 1, $h) # add 1 for cursor 2002 ($w + 1, $h) # add 1 for cursor
1627} 2003}
1628 2004
1629sub key_down { 2005sub invoke_key_down {
1630 my ($self, $ev) = @_; 2006 my ($self, $ev) = @_;
1631 2007
1632 my $mod = $ev->{mod}; 2008 my $mod = $ev->{mod};
1633 my $sym = $ev->{sym}; 2009 my $sym = $ev->{sym};
1634 my $uni = $ev->{unicode}; 2010 my $uni = $ev->{unicode};
1635 2011
1636 my $text = $self->get_text; 2012 my $text = $self->get_text;
2013
2014 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1637 2015
1638 if ($uni == 8) { 2016 if ($uni == 8) {
1639 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2017 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1640 } elsif ($uni == 127) { 2018 } elsif ($uni == 127) {
1641 substr $text, $self->{cursor}, 1, ""; 2019 substr $text, $self->{cursor}, 1, "";
1642 } elsif ($sym == CFClient::SDLK_LEFT) { 2020 } elsif ($sym == CFPlus::SDLK_LEFT) {
1643 --$self->{cursor} if $self->{cursor}; 2021 --$self->{cursor} if $self->{cursor};
1644 } elsif ($sym == CFClient::SDLK_RIGHT) { 2022 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1645 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2023 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1646 } elsif ($sym == CFClient::SDLK_HOME) { 2024 } elsif ($sym == CFPlus::SDLK_HOME) {
2025 # what a hack
2026 $self->{cursor} =
2027 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2028 ? length $1
2029 : 0;
2030 } elsif ($sym == CFPlus::SDLK_END) {
2031 # uh, again
2032 $self->{cursor} =
2033 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2034 ? $self->{cursor} + length $1
2035 : length $self->{text};
2036 } elsif ($uni == 21) { # ctrl-u
2037 $text = "";
1647 $self->{cursor} = 0; 2038 $self->{cursor} = 0;
1648 } elsif ($sym == CFClient::SDLK_END) {
1649 $self->{cursor} = length $text;
1650 } elsif ($uni == 27) { 2039 } elsif ($uni == 27) {
1651 $self->_emit ('escape'); 2040 $self->emit ('escape');
1652 } elsif ($uni) { 2041 } elsif ($uni == 0x0d) {
2042 substr $text, $self->{cursor}++, 0, "\012";
2043 } elsif ($uni >= 0x20) {
1653 substr $text, $self->{cursor}++, 0, chr $uni; 2044 substr $text, $self->{cursor}++, 0, chr $uni;
2045 } else {
2046 return 0;
1654 } 2047 }
1655 2048
1656 $self->_set_text ($text); 2049 $self->_set_text ($text);
2050
2051 $self->realloc;
1657 $self->update; 2052 $self->update;
1658 $self->check_size;
1659}
1660 2053
2054 1
2055}
2056
1661sub focus_in { 2057sub invoke_focus_in {
1662 my ($self) = @_; 2058 my ($self) = @_;
1663 2059
1664 $self->{last_activity} = $::NOW; 2060 $self->{last_activity} = $::NOW;
1665 2061
1666 $self->SUPER::focus_in; 2062 $self->SUPER::invoke_focus_in
1667} 2063}
1668 2064
1669sub button_down { 2065sub invoke_button_down {
1670 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1671 2067
1672 $self->SUPER::button_down ($ev, $x, $y); 2068 $self->SUPER::invoke_button_down ($ev, $x, $y);
1673 2069
1674 my $idx = $self->{layout}->xy_to_index ($x, $y); 2070 my $idx = $self->{layout}->xy_to_index ($x, $y);
1675 2071
1676 # byte-index to char-index 2072 # byte-index to char-index
1677 my $text = $self->{text}; 2073 my $text = $self->{text};
1678 utf8::encode $text; 2074 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1679 $self->{cursor} = length substr $text, 0, $idx; 2075 $self->{cursor} = length $text;
1680 2076
1681 $self->_set_text ($self->{text}); 2077 $self->_set_text ($self->{text});
1682 $self->update; 2078 $self->update;
2079
2080 1
1683} 2081}
1684 2082
1685sub mouse_motion { 2083sub invoke_mouse_motion {
1686 my ($self, $ev, $x, $y) = @_; 2084 my ($self, $ev, $x, $y) = @_;
1687# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 2085# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
2086
2087 1
1688} 2088}
1689 2089
1690sub _draw { 2090sub _draw {
1691 my ($self) = @_; 2091 my ($self) = @_;
1692 2092
1693 local $self->{fg} = $self->{fg}; 2093 local $self->{fg} = $self->{fg};
1694 2094
1695 if ($FOCUS == $self) { 2095 if ($FOCUS == $self) {
1696 glColor @{$self->{active_bg}}; 2096 glColor_premultiply @{$self->{active_bg}};
1697 $self->{fg} = $self->{active_fg}; 2097 $self->{fg} = $self->{active_fg};
1698 } else { 2098 } else {
1699 glColor @{$self->{bg}}; 2099 glColor_premultiply @{$self->{bg}};
1700 } 2100 }
1701 2101
1702 glEnable GL_BLEND; 2102 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1704 glBegin GL_QUADS; 2104 glBegin GL_QUADS;
1705 glVertex 0 , 0; 2105 glVertex 0 , 0;
1706 glVertex 0 , $self->{h}; 2106 glVertex 0 , $self->{h};
1707 glVertex $self->{w}, $self->{h}; 2107 glVertex $self->{w}, $self->{h};
1708 glVertex $self->{w}, 0; 2108 glVertex $self->{w}, 0;
… …
1719 utf8::encode $text; 2119 utf8::encode $text;
1720 2120
1721 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2121 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1722 } 2122 }
1723 2123
1724 glColor @{$self->{fg}};
1725 glBegin GL_LINES; 2124 glBegin GL_LINES;
1726 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2125 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}; 2126 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1728 glEnd; 2127 glEnd;
1729 } 2128 }
1730} 2129}
1731 2130
2131#############################################################################
2132
1732package CFClient::UI::Entry; 2133package CFPlus::UI::Entry;
1733 2134
1734our @ISA = CFClient::UI::EntryBase::; 2135our @ISA = CFPlus::UI::EntryBase::;
1735 2136
1736use CFClient::OpenGL; 2137use CFPlus::OpenGL;
1737 2138
1738sub key_down { 2139sub invoke_key_down {
1739 my ($self, $ev) = @_; 2140 my ($self, $ev) = @_;
1740 2141
1741 my $sym = $ev->{sym}; 2142 my $sym = $ev->{sym};
1742 2143
1743 if ($sym == 13) { 2144 if ($ev->{uni} == 0x0d || $sym == 13) {
1744 unshift @{$self->{history}}, 2145 unshift @{$self->{history}},
1745 my $txt = $self->get_text; 2146 my $txt = $self->get_text;
2147
1746 $self->{history_pointer} = -1; 2148 $self->{history_pointer} = -1;
1747 $self->{history_saveback} = ''; 2149 $self->{history_saveback} = '';
1748 $self->_emit (activate => $txt); 2150 $self->emit (activate => $txt);
1749 $self->update; 2151 $self->update;
1750 2152
1751 } elsif ($sym == CFClient::SDLK_UP) { 2153 } elsif ($sym == CFPlus::SDLK_UP) {
1752 if ($self->{history_pointer} < 0) { 2154 if ($self->{history_pointer} < 0) {
1753 $self->{history_saveback} = $self->get_text; 2155 $self->{history_saveback} = $self->get_text;
1754 } 2156 }
1755 if (@{$self->{history} || []} > 0) { 2157 if (@{$self->{history} || []} > 0) {
1756 $self->{history_pointer}++; 2158 $self->{history_pointer}++;
… …
1758 $self->{history_pointer} = @{$self->{history} || []} - 1; 2160 $self->{history_pointer} = @{$self->{history} || []} - 1;
1759 } 2161 }
1760 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2162 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1761 } 2163 }
1762 2164
1763 } elsif ($sym == CFClient::SDLK_DOWN) { 2165 } elsif ($sym == CFPlus::SDLK_DOWN) {
1764 $self->{history_pointer}--; 2166 $self->{history_pointer}--;
1765 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2167 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1766 2168
1767 if ($self->{history_pointer} >= 0) { 2169 if ($self->{history_pointer} >= 0) {
1768 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2170 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1769 } else { 2171 } else {
1770 $self->set_text ($self->{history_saveback}); 2172 $self->set_text ($self->{history_saveback});
1771 } 2173 }
1772 2174
1773 } else { 2175 } else {
1774 $self->SUPER::key_down ($ev); 2176 return $self->SUPER::invoke_key_down ($ev)
2177 }
2178
1775 } 2179 1
1776
1777} 2180}
1778 2181
1779############################################################################# 2182#############################################################################
1780 2183
2184package CFPlus::UI::TextEdit;
2185
2186our @ISA = CFPlus::UI::EntryBase::;
2187
2188use CFPlus::OpenGL;
2189
2190sub move_cursor_ver {
2191 my ($self, $dy) = @_;
2192
2193 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2194
2195 $y += $dy;
2196
2197 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2198 $self->{cursor} = $index;
2199 delete $self->{cur_h};
2200 $self->update;
2201 return;
2202 }
2203}
2204
2205sub invoke_key_down {
2206 my ($self, $ev) = @_;
2207
2208 my $sym = $ev->{sym};
2209
2210 if ($sym == CFPlus::SDLK_UP) {
2211 $self->move_cursor_ver (-1);
2212 } elsif ($sym == CFPlus::SDLK_DOWN) {
2213 $self->move_cursor_ver (+1);
2214 } else {
2215 return $self->SUPER::invoke_key_down ($ev)
2216 }
2217
2218 1
2219}
2220
2221#############################################################################
2222
1781package CFClient::UI::Button; 2223package CFPlus::UI::Button;
1782 2224
1783our @ISA = CFClient::UI::Label::; 2225our @ISA = CFPlus::UI::Label::;
1784 2226
1785use CFClient::OpenGL; 2227use CFPlus::OpenGL;
1786 2228
1787my @tex = 2229my @tex =
1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1789 qw(b1_button_active.png); 2231 qw(b1_button_active.png);
1790 2232
1791sub new { 2233sub new {
1792 my $class = shift; 2234 my $class = shift;
1793 2235
1794 $class->SUPER::new ( 2236 $class->SUPER::new (
1795 padding => 4, 2237 padding_x => 4,
2238 padding_y => 4,
1796 fg => [1, 1, 1], 2239 fg => [1, 1, 1],
1797 active_fg => [0, 0, 1], 2240 active_fg => [0, 0, 1],
1798 can_hover => 1, 2241 can_hover => 1,
1799 align => 0, 2242 align => 0,
1800 valign => 0, 2243 valign => 0,
1801 can_events => 1, 2244 can_events => 1,
1802 @_ 2245 @_
1803 ) 2246 )
1804} 2247}
1805 2248
1806sub activate { }
1807
1808sub button_up { 2249sub invoke_button_up {
1809 my ($self, $ev, $x, $y) = @_; 2250 my ($self, $ev, $x, $y) = @_;
1810 2251
1811 $self->emit ("activate") 2252 $self->emit ("activate")
1812 if $x >= 0 && $x < $self->{w} 2253 if $x >= 0 && $x < $self->{w}
1813 && $y >= 0 && $y < $self->{h}; 2254 && $y >= 0 && $y < $self->{h};
2255
2256 1
1814} 2257}
1815 2258
1816sub _draw { 2259sub _draw {
1817 my ($self) = @_; 2260 my ($self) = @_;
1818 2261
1819 local $self->{fg} = $self->{fg}; 2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1820
1821 if ($GRAB == $self) {
1822 $self->{fg} = $self->{active_fg};
1823 }
1824 2263
1825 glEnable GL_TEXTURE_2D; 2264 glEnable GL_TEXTURE_2D;
1826 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1827 glColor 0, 0, 0, 1; 2266 glColor 0, 0, 0, 1;
1828 2267
… …
1833 $self->SUPER::_draw; 2272 $self->SUPER::_draw;
1834} 2273}
1835 2274
1836############################################################################# 2275#############################################################################
1837 2276
1838package CFClient::UI::CheckBox; 2277package CFPlus::UI::CheckBox;
1839 2278
1840our @ISA = CFClient::UI::DrawBG::; 2279our @ISA = CFPlus::UI::DrawBG::;
1841 2280
1842my @tex = 2281my @tex =
1843 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2282 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1844 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2283 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1845 2284
1846use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1847 2286
1848sub new { 2287sub new {
1849 my $class = shift; 2288 my $class = shift;
1850 2289
1851 $class->SUPER::new ( 2290 $class->SUPER::new (
1852 padding => 2, 2291 padding_x => 2,
2292 padding_y => 2,
1853 fg => [1, 1, 1], 2293 fg => [1, 1, 1],
1854 active_fg => [1, 1, 0], 2294 active_fg => [1, 1, 0],
1855 bg => [0, 0, 0, 0.2], 2295 bg => [0, 0, 0, 0.2],
1856 active_bg => [1, 1, 1, 0.5], 2296 active_bg => [1, 1, 1, 0.5],
1857 state => 0, 2297 state => 0,
… …
1861} 2301}
1862 2302
1863sub size_request { 2303sub size_request {
1864 my ($self) = @_; 2304 my ($self) = @_;
1865 2305
1866 ($self->{padding} * 2 + 6) x 2 2306 (6) x 2
1867} 2307}
1868 2308
2309sub toggle {
2310 my ($self) = @_;
2311
2312 $self->{state} = !$self->{state};
2313 $self->emit (changed => $self->{state});
2314 $self->update;
2315}
2316
1869sub button_down { 2317sub invoke_button_down {
1870 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1871 2319
1872 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2320 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1873 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2321 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1874 $self->{state} = !$self->{state}; 2322 $self->toggle;
1875 $self->_emit (changed => $self->{state}); 2323 } else {
2324 return 0
2325 }
2326
1876 } 2327 1
1877} 2328}
1878 2329
1879sub _draw { 2330sub _draw {
1880 my ($self) = @_; 2331 my ($self) = @_;
1881 2332
1882 $self->SUPER::_draw; 2333 $self->SUPER::_draw;
1883 2334
1884 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2335 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1885 2336
1886 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2337 my ($w, $h) = @$self{qw(w h)};
2338
2339 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1887 2340
1888 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2341 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1889 2342
1890 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2343 my $tex = $self->{state} ? $tex[1] : $tex[0];
1891 2344
… …
1894 glDisable GL_TEXTURE_2D; 2347 glDisable GL_TEXTURE_2D;
1895} 2348}
1896 2349
1897############################################################################# 2350#############################################################################
1898 2351
1899package CFClient::UI::Image; 2352package CFPlus::UI::Image;
1900 2353
1901our @ISA = CFClient::UI::Base::; 2354our @ISA = CFPlus::UI::Base::;
1902 2355
1903use CFClient::OpenGL; 2356use CFPlus::OpenGL;
1904use Carp qw/confess/;
1905 2357
1906our %loaded_images; 2358our %texture_cache;
1907 2359
1908sub new { 2360sub new {
1909 my $class = shift; 2361 my $class = shift;
1910 2362
1911 my $self = $class->SUPER::new (can_events => 0, @_); 2363 my $self = $class->SUPER::new (
2364 can_events => 0,
2365 @_,
2366 );
1912 2367
1913 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2368 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required";
1914 2370
1915 $loaded_images{$self->{image}} ||= 2371 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1916 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2372 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1917 2373
1918 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2374 CFPlus::weaken $texture_cache{$self->{path}};
1919 2375
1920 Scalar::Util::weaken $loaded_images{$self->{image}}; 2376 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1921
1922 $self->{aspect} = $tex->{w} / $tex->{h};
1923 2377
1924 $self 2378 $self
1925} 2379}
1926 2380
2381sub STORABLE_freeze {
2382 my ($self, $cloning) = @_;
2383
2384 $self->{path}
2385 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2386
2387 $self->{path}
2388}
2389
2390sub STORABLE_attach {
2391 my ($self, $cloning, $path) = @_;
2392
2393 $self->new (path => $path)
2394}
2395
1927sub size_request { 2396sub size_request {
1928 my ($self) = @_; 2397 my ($self) = @_;
1929 2398
1930 ($self->{tex}->{w}, $self->{tex}->{h}) 2399 ($self->{tex}{w}, $self->{tex}{h})
1931} 2400}
1932 2401
1933sub _draw { 2402sub _draw {
1934 my ($self) = @_; 2403 my ($self) = @_;
1935 2404
… …
1945 } 2414 }
1946 2415
1947 glEnable GL_TEXTURE_2D; 2416 glEnable GL_TEXTURE_2D;
1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1949 2418
1950 $tex->draw_quad_alpha (0, 0, $w, $h); 2419 $tex->draw_quad (0, 0, $w, $h);
1951 2420
1952 glDisable GL_TEXTURE_2D; 2421 glDisable GL_TEXTURE_2D;
1953} 2422}
1954 2423
1955############################################################################# 2424#############################################################################
1956 2425
2426package CFPlus::UI::ImageButton;
2427
2428our @ISA = CFPlus::UI::Image::;
2429
2430use CFPlus::OpenGL;
2431
2432my %textures;
2433
2434sub new {
2435 my $class = shift;
2436
2437 my $self = $class->SUPER::new (
2438 padding_x => 4,
2439 padding_y => 4,
2440 fg => [1, 1, 1],
2441 active_fg => [0, 0, 1],
2442 can_hover => 1,
2443 align => 0,
2444 valign => 0,
2445 can_events => 1,
2446 @_
2447 );
2448}
2449
2450sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_;
2452
2453 $self->emit ("activate")
2454 if $x >= 0 && $x < $self->{w}
2455 && $y >= 0 && $y < $self->{h};
2456
2457 1
2458}
2459
2460#############################################################################
2461
1957package CFClient::UI::VGauge; 2462package CFPlus::UI::VGauge;
1958 2463
1959our @ISA = CFClient::UI::Base::; 2464our @ISA = CFPlus::UI::Base::;
1960 2465
1961use List::Util qw(min max); 2466use List::Util qw(min max);
1962 2467
1963use CFClient::OpenGL; 2468use CFPlus::OpenGL;
1964 2469
1965my %tex = ( 2470my %tex = (
1966 food => [ 2471 food => [
1967 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2472 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1968 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2473 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1969 ], 2474 ],
1970 grace => [ 2475 grace => [
1971 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2476 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/ 2477 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1973 ], 2478 ],
1974 hp => [ 2479 hp => [
1975 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2480 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1976 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2481 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1977 ], 2482 ],
1978 mana => [ 2483 mana => [
1979 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2484 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/ 2485 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1981 ], 2486 ],
1982); 2487);
1983 2488
1984# eg. VGauge->new (gauge => 'food'), default gauge: food 2489# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2044 my $ycut1 = max 0, min 1, $ycut; 2549 my $ycut1 = max 0, min 1, $ycut;
2045 my $ycut2 = max 0, min 1, $ycut - 1; 2550 my $ycut2 = max 0, min 1, $ycut - 1;
2046 2551
2047 my $h1 = $self->{h} * (1 - $ycut1); 2552 my $h1 = $self->{h} * (1 - $ycut1);
2048 my $h2 = $self->{h} * (1 - $ycut2); 2553 my $h2 = $self->{h} * (1 - $ycut2);
2554 my $h3 = $self->{h};
2555
2556 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2049 2557
2050 glEnable GL_BLEND; 2558 glEnable GL_BLEND;
2051 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2559 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2560 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2052 glEnable GL_TEXTURE_2D; 2561 glEnable GL_TEXTURE_2D;
2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2562 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2054 2563
2055 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2564 glBindTexture GL_TEXTURE_2D, $t1->{name};
2056 glBegin GL_QUADS; 2565 glBegin GL_QUADS;
… …
2071 2580
2072 if ($t3) { 2581 if ($t3) {
2073 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2582 glBindTexture GL_TEXTURE_2D, $t3->{name};
2074 glBegin GL_QUADS; 2583 glBegin GL_QUADS;
2075 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2584 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2076 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2585 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2077 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2586 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2078 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2587 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2079 glEnd; 2588 glEnd;
2080 } 2589 }
2081 2590
2082 glDisable GL_BLEND; 2591 glDisable GL_BLEND;
2083 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
2084} 2593}
2085 2594
2086############################################################################# 2595#############################################################################
2087 2596
2088package CFClient::UI::Gauge; 2597package CFPlus::UI::Gauge;
2089 2598
2090our @ISA = CFClient::UI::VBox::; 2599our @ISA = CFPlus::UI::VBox::;
2091 2600
2092sub new { 2601sub new {
2093 my ($class, %arg) = @_; 2602 my ($class, %arg) = @_;
2094 2603
2095 my $self = $class->SUPER::new ( 2604 my $self = $class->SUPER::new (
… …
2097 can_hover => 1, 2606 can_hover => 1,
2098 can_events => 1, 2607 can_events => 1,
2099 %arg, 2608 %arg,
2100 ); 2609 );
2101 2610
2102 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2611 $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); 2612 $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"); 2613 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2105 2614
2106 $self 2615 $self
2107} 2616}
2108 2617
2109sub set_fontsize { 2618sub set_fontsize {
… …
2130 $self->{value}->set_text ($val); 2639 $self->{value}->set_text ($val);
2131} 2640}
2132 2641
2133############################################################################# 2642#############################################################################
2134 2643
2135package CFClient::UI::Slider; 2644package CFPlus::UI::Slider;
2136 2645
2137use strict; 2646use strict;
2138 2647
2139use CFClient::OpenGL; 2648use CFPlus::OpenGL;
2140 2649
2141our @ISA = CFClient::UI::DrawBG::; 2650our @ISA = CFPlus::UI::DrawBG::;
2142 2651
2143my @tex = 2652my @tex =
2144 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2653 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2145 qw(s1_slider.png s1_slider_bg.png); 2654 qw(s1_slider.png s1_slider_bg.png);
2146 2655
2147sub new { 2656sub new {
2148 my $class = shift; 2657 my $class = shift;
2149 2658
… …
2156 fg => [1, 1, 1], 2665 fg => [1, 1, 1],
2157 active_fg => [0, 0, 0], 2666 active_fg => [0, 0, 0],
2158 bg => [0, 0, 0, 0.2], 2667 bg => [0, 0, 0, 0.2],
2159 active_bg => [1, 1, 1, 0.5], 2668 active_bg => [1, 1, 1, 0.5],
2160 range => [0, 0, 100, 10, 0], 2669 range => [0, 0, 100, 10, 0],
2161 req_w => $::WIDTH / 80, 2670 min_w => $::WIDTH / 80,
2162 req_h => $::WIDTH / 80, 2671 min_h => $::WIDTH / 80,
2163 vertical => 0, 2672 vertical => 0,
2164 can_hover => 1, 2673 can_hover => 1,
2165 inner_pad => 0.02, 2674 inner_pad => 0.02,
2166 @_ 2675 @_
2167 ); 2676 );
… …
2175sub set_range { 2684sub set_range {
2176 my ($self, $range) = @_; 2685 my ($self, $range) = @_;
2177 2686
2178 ($range, $self->{range}) = ($self->{range}, $range); 2687 ($range, $self->{range}) = ($self->{range}, $range);
2179 2688
2180 $self->update
2181 if "@$range" ne "@{$self->{range}}"; 2689 if ("@$range" ne "@{$self->{range}}") {
2690 $self->update;
2691 $self->set_value ($self->{range}[0]);
2692 }
2182} 2693}
2183 2694
2184sub set_value { 2695sub set_value {
2185 my ($self, $value) = @_; 2696 my ($self, $value) = @_;
2186 2697
… …
2197 if $unit; 2708 if $unit;
2198 2709
2199 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2710 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2200 2711
2201 if ($value != $old_value) { 2712 if ($value != $old_value) {
2202 $self->_emit (changed => $value); 2713 $self->emit (changed => $value);
2203 $self->update; 2714 $self->update;
2204 } 2715 }
2205} 2716}
2206 2717
2207sub size_request { 2718sub size_request {
2208 my ($self) = @_; 2719 my ($self) = @_;
2209 2720
2210 my $w = $self->{req_w}; 2721 ($self->{req_w}, $self->{req_h})
2211 my $h = $self->{req_h};
2212
2213 $self->{vertical} ? ($h, $w) : ($w, $h)
2214} 2722}
2215 2723
2216sub button_down { 2724sub invoke_button_down {
2217 my ($self, $ev, $x, $y) = @_; 2725 my ($self, $ev, $x, $y) = @_;
2218 2726
2219 $self->SUPER::button_down ($ev, $x, $y); 2727 $self->SUPER::invoke_button_down ($ev, $x, $y);
2220 2728
2221 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2222 2730
2223 $self->mouse_motion ($ev, $x, $y); 2731 $self->invoke_mouse_motion ($ev, $x, $y)
2224} 2732}
2225 2733
2226sub mouse_motion { 2734sub invoke_mouse_motion {
2227 my ($self, $ev, $x, $y) = @_; 2735 my ($self, $ev, $x, $y) = @_;
2228 2736
2229 if ($GRAB == $self) { 2737 if ($GRAB == $self) {
2230 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2738 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2231 2739
2232 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2740 my (undef, $lo, $hi, $page) = @{$self->{range}};
2233 2741
2234 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2742 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2235 2743
2236 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2744 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2745 } else {
2746 return 0;
2747 }
2748
2237 } 2749 1
2750}
2751
2752sub invoke_mouse_wheel {
2753 my ($self, $ev) = @_;
2754
2755 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2756
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760
2761 ! ! $delta
2238} 2762}
2239 2763
2240sub update { 2764sub update {
2241 my ($self) = @_; 2765 my ($self) = @_;
2242 2766
2243 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2767 delete $self->{knob_w};
2768 $self->SUPER::update;
2769}
2770
2771sub _draw {
2772 my ($self) = @_;
2773
2774 unless ($self->{knob_w}) {
2244 $self->set_value ($self->{range}[0]); 2775 $self->set_value ($self->{range}[0]);
2245 2776
2246 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2777 my ($value, $lo, $hi, $page) = @{$self->{range}};
2247 my $range = ($hi - $page - $lo) || 1e-100; 2778 my $range = ($hi - $page - $lo) || 1e-100;
2248 2779
… …
2254 $value = ($value - $lo) / $range; 2785 $value = ($value - $lo) / $range;
2255 $value = $value * $self->{scale} + $self->{offset}; 2786 $value = $value * $self->{scale} + $self->{offset};
2256 2787
2257 $self->{knob_x} = $value - $knob_w * 0.5; 2788 $self->{knob_x} = $value - $knob_w * 0.5;
2258 $self->{knob_w} = $knob_w; 2789 $self->{knob_w} = $knob_w;
2259 }); 2790 }
2260
2261 $self->SUPER::update;
2262}
2263
2264sub _draw {
2265 my ($self) = @_;
2266 2791
2267 $self->SUPER::_draw (); 2792 $self->SUPER::_draw ();
2268 2793
2269 glScale $self->{w}, $self->{h}; 2794 glScale $self->{w}, $self->{h};
2270 2795
… …
2290 glDisable GL_TEXTURE_2D; 2815 glDisable GL_TEXTURE_2D;
2291} 2816}
2292 2817
2293############################################################################# 2818#############################################################################
2294 2819
2295package CFClient::UI::ValSlider; 2820package CFPlus::UI::ValSlider;
2296 2821
2297our @ISA = CFClient::UI::HBox::; 2822our @ISA = CFPlus::UI::HBox::;
2298 2823
2299sub new { 2824sub new {
2300 my ($class, %arg) = @_; 2825 my ($class, %arg) = @_;
2301 2826
2302 my $range = delete $arg{range}; 2827 my $range = delete $arg{range};
2303 2828
2304 my $self = $class->SUPER::new ( 2829 my $self = $class->SUPER::new (
2305 slider => (new CFClient::UI::Slider expand => 1, range => $range), 2830 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2306 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 2831 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2307 to_value => sub { shift }, 2832 to_value => sub { shift },
2308 from_value => sub { shift }, 2833 from_value => sub { shift },
2309 %arg, 2834 %arg,
2310 ); 2835 );
2311 2836
… …
2331sub set_range { shift->{slider}->set_range (@_) } 2856sub set_range { shift->{slider}->set_range (@_) }
2332sub set_value { shift->{slider}->set_value (@_) } 2857sub set_value { shift->{slider}->set_value (@_) }
2333 2858
2334############################################################################# 2859#############################################################################
2335 2860
2336package CFClient::UI::TextView; 2861package CFPlus::UI::TextScroller;
2337 2862
2338our @ISA = CFClient::UI::HBox::; 2863our @ISA = CFPlus::UI::HBox::;
2339 2864
2340use CFClient::OpenGL; 2865use CFPlus::OpenGL;
2341 2866
2342sub new { 2867sub new {
2343 my $class = shift; 2868 my $class = shift;
2344 2869
2345 my $self = $class->SUPER::new ( 2870 my $self = $class->SUPER::new (
2346 fontsize => 1, 2871 fontsize => 1,
2347 can_events => 0, 2872 can_events => 1,
2873 indent => 0,
2348 #font => default_font 2874 #font => default_font
2349 @_, 2875 @_,
2350 2876
2351 layout => (new CFClient::Layout 1), 2877 layout => (new CFPlus::Layout),
2352 par => [], 2878 par => [],
2879 max_par => 0,
2353 height => 0, 2880 height => 0,
2354 children => [ 2881 children => [
2355 (new CFClient::UI::Empty expand => 1), 2882 (new CFPlus::UI::Empty expand => 1),
2356 (new CFClient::UI::Slider vertical => 1), 2883 (new CFPlus::UI::Slider vertical => 1),
2357 ], 2884 ],
2358 ); 2885 );
2359 2886
2360 $self->{children}[1]->connect (changed => sub { $self->update }); 2887 $self->{children}[1]->connect (changed => sub { $self->update });
2361 2888
… …
2367 2894
2368 $self->{fontsize} = $fontsize; 2895 $self->{fontsize} = $fontsize;
2369 $self->reflow; 2896 $self->reflow;
2370} 2897}
2371 2898
2899sub size_request {
2900 my ($self) = @_;
2901
2902 my ($empty, $slider) = @{ $self->{children} };
2903
2904 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request
2906}
2907
2372sub size_allocate { 2908sub invoke_size_allocate {
2373 my ($self, $w, $h) = @_; 2909 my ($self, $w, $h) = @_;
2374 2910
2375 $self->SUPER::size_allocate ($w, $h); 2911 my ($empty, $slider, @other) = @{ $self->{children} };
2912 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2376 2913
2377 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2914 $self->{layout}->set_font ($self->{font}) if $self->{font};
2378 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2915 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2379 $self->{layout}->set_width ($self->{children}[0]{w}); 2916 $self->{layout}->set_width ($empty->{w});
2917 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2380 2918
2381 $self->reflow; 2919 $self->reflow;
2382}
2383 2920
2384sub text_size { 2921 local $self->{children} = [$empty, $slider];
2922 $self->SUPER::invoke_size_allocate ($w, $h)
2923}
2924
2925sub invoke_mouse_wheel {
2385 my ($self, $text, $indent) = @_; 2926 my ($self, $ev) = @_;
2927
2928 return 0 unless $ev->{dy}; # only vertical movements
2929
2930 $self->{children}[1]->emit (mouse_wheel => $ev);
2931
2932 1
2933}
2934
2935sub get_layout {
2936 my ($self, $para) = @_;
2386 2937
2387 my $layout = $self->{layout}; 2938 my $layout = $self->{layout};
2388 2939
2940 $layout->set_font ($self->{font}) if $self->{font};
2941 $layout->set_foreground (@{$para->{fg}});
2389 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2942 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2390 $layout->set_width ($self->{children}[0]{w} - $indent); 2943 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2944 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2391 $layout->set_markup ($text); 2945 $layout->set_markup ($para->{markup});
2946
2947 $layout->set_shapes (
2948 map
2949 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2950 @{$para->{widget}}
2392 2951 );
2952
2393 $layout->size 2953 $layout
2394} 2954}
2395 2955
2396sub reflow { 2956sub reflow {
2397 my ($self) = @_; 2957 my ($self) = @_;
2398 2958
… …
2405 2965
2406 # todo: base offset on lines or so, not on pixels 2966 # todo: base offset on lines or so, not on pixels
2407 $self->{children}[1]->set_value ($offset); 2967 $self->{children}[1]->set_value ($offset);
2408} 2968}
2409 2969
2970sub current_paragraph {
2971 my ($self) = @_;
2972
2973 $self->{top_paragraph} - 1
2974}
2975
2976sub scroll_to {
2977 my ($self, $para) = @_;
2978
2979 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2980
2981 $self->{scroll_to} = $para;
2982 $self->update;
2983}
2984
2410sub clear { 2985sub clear {
2411 my ($self) = @_; 2986 my ($self) = @_;
2987
2988 my (undef, undef, @other) = @{ $self->{children} };
2989 $self->remove ($_) for @other;
2412 2990
2413 $self->{par} = []; 2991 $self->{par} = [];
2414 $self->{height} = 0; 2992 $self->{height} = 0;
2415 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2993 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2416} 2994}
2417 2995
2418sub add_paragraph { 2996sub add_paragraph {
2419 my ($self, $color, $text, $indent) = @_; 2997 my $self = shift;
2420 2998
2421 for my $line (split /\n/, $text) { 2999 for my $para (@_) {
2422 my ($w, $h) = $self->text_size ($line); 3000 $para = {
3001 fg => [1, 1, 1, 1],
3002 indent => 0,
3003 markup => "",
3004 widget => [],
3005 ref $para ? %$para : (markup => $para),
3006 w => 1e10,
3007 wrapped => 1,
3008 };
3009
3010 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3011 push @{$self->{par}}, $para;
3012 }
3013
3014 if (my $max = $self->{max_par}) {
3015 shift @{$self->{par}} while @{$self->{par}} > $max;
3016 }
3017
3018 $self->{need_reflow}++;
3019 $self->update;
3020}
3021
3022sub scroll_to_bottom {
3023 my ($self) = @_;
3024
3025 $self->{scroll_to} = $#{$self->{par}};
3026 $self->update;
3027}
3028
3029sub force_uptodate {
3030 my ($self) = @_;
3031
3032 if (delete $self->{need_reflow}) {
3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3034
3035 my $height = 0;
3036
3037 for my $para (@{$self->{par}}) {
3038 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
3039 my $layout = $self->get_layout ($para);
3040 my ($w, $h) = $layout->size;
3041
3042 $para->{w} = $w + $para->{indent};
3043 $para->{h} = $h;
3044 $para->{wrapped} = $layout->has_wrapped;
3045 }
3046
3047 $para->{y} = $height;
3048 $height += $para->{h};
3049 }
3050
2423 $self->{height} += $h; 3051 $self->{height} = $height;
2424 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3052 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2425 }
2426 3053
2427 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3054 delete $self->{texture};
3055 }
3056
3057 if (my $paridx = delete $self->{scroll_to}) {
3058 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3059 }
2428} 3060}
2429 3061
2430sub update { 3062sub update {
2431 my ($self) = @_; 3063 my ($self) = @_;
2432 3064
… …
2434 3066
2435 return unless $self->{h} > 0; 3067 return unless $self->{h} > 0;
2436 3068
2437 delete $self->{texture}; 3069 delete $self->{texture};
2438 3070
2439 $ROOT->on_post_alloc ($self, sub { 3071 $ROOT->on_post_alloc ($self => sub {
3072 $self->force_uptodate;
3073
2440 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3074 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2441 3075
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 { 3076 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2469 glClearColor 0.5, 0.5, 0.5, 0; 3077 glClearColor 0, 0, 0, 0;
2470 glClear GL_COLOR_BUFFER_BIT; 3078 glClear GL_COLOR_BUFFER_BIT;
2471 3079
3080 package CFPlus::UI::Base;
3081 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3082 (0, 0, $self->{w}, $self->{h});
3083
3084 my $top = int $self->{children}[1]{range}[0];
3085
3086 my $paridx = 0;
3087 my $top_paragraph;
2472 my $top = int $self->{children}[1]{range}[0]; 3088 my $top = int $self->{children}[1]{range}[0];
2473 3089
2474 my $y0 = $top; 3090 my $y0 = $top;
2475 my $y1 = $top + $H; 3091 my $y1 = $top + $H;
2476 3092
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}}) { 3093 for my $para (@{$self->{par}}) {
2488 my $h = $par->[1]; 3094 my $h = $para->{h};
3095 my $y = $para->{y};
2489 3096
2490 if ($y0 < $y + $h && $y < $y1) { 3097 if ($y0 < $y + $h && $y < $y1) {
2491 $layout->set_foreground (@{ $par->[2] }); 3098 my $layout = $self->get_layout ($para);
2492 $layout->set_width ($W - $par->[3]);
2493 $layout->set_markup ($par->[4]);
2494 3099
2495 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3100 $layout->render ($para->{indent}, $y - $y0);
2496 3101
2497 glRasterPos $par->[3], $y - $y0; 3102 if (my @w = @{ $para->{widget} }) {
2498 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 3103 my @s = $layout->get_shapes;
3104
3105 for (@w) {
3106 my ($dx, $dy) = splice @s, 0, 2, ();
3107
3108 $_->{x} = $dx + $para->{indent};
3109 $_->{y} = $dy + $y - $y0;
3110
3111 $_->draw;
3112 }
3113 }
2499 } 3114 }
2500 3115
2501 $y += $h; 3116 $paridx++;
3117 $top_paragraph ||= $paridx if $y >= $top;
2502 } 3118 }
2503 3119
2504 glDisable GL_BLEND; 3120 $self->{top_paragraph} = $top_paragraph;
2505 }; 3121 };
2506 }); 3122 });
2507} 3123}
2508 3124
3125sub reconfigure {
3126 my ($self) = @_;
3127
3128 $self->SUPER::reconfigure;
3129
3130 $_->{w} = 1e10 for @{ $self->{par} };
3131 $self->reflow;
3132}
3133
2509sub _draw { 3134sub _draw {
2510 my ($self) = @_; 3135 my ($self) = @_;
2511 3136
2512 glEnable GL_TEXTURE_2D; 3137 glEnable GL_TEXTURE_2D;
2513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3138 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514 glColor 1, 1, 1, 1; 3139 glColor 0, 0, 0, 1;
2515 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 3140 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2516 glDisable GL_TEXTURE_2D; 3141 glDisable GL_TEXTURE_2D;
2517 3142
2518 $self->{children}[1]->draw; 3143 $self->{children}[1]->draw;
2519
2520} 3144}
2521 3145
2522############################################################################# 3146#############################################################################
2523 3147
2524package CFClient::UI::Animator; 3148package CFPlus::UI::Animator;
2525 3149
2526use CFClient::OpenGL; 3150use CFPlus::OpenGL;
2527 3151
2528our @ISA = CFClient::UI::Bin::; 3152our @ISA = CFPlus::UI::Bin::;
2529 3153
2530sub moveto { 3154sub moveto {
2531 my ($self, $x, $y) = @_; 3155 my ($self, $x, $y) = @_;
2532 3156
2533 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3157 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2561 glPopMatrix; 3185 glPopMatrix;
2562} 3186}
2563 3187
2564############################################################################# 3188#############################################################################
2565 3189
2566package CFClient::UI::Flopper; 3190package CFPlus::UI::Flopper;
2567 3191
2568our @ISA = CFClient::UI::Button::; 3192our @ISA = CFPlus::UI::Button::;
2569 3193
2570sub new { 3194sub new {
2571 my $class = shift; 3195 my $class = shift;
2572 3196
2573 my $self = $class->SUPER::new ( 3197 my $self = $class->SUPER::new (
… …
2585 $self->{other}->toggle_visibility; 3209 $self->{other}->toggle_visibility;
2586} 3210}
2587 3211
2588############################################################################# 3212#############################################################################
2589 3213
2590package CFClient::UI::Tooltip; 3214package CFPlus::UI::Tooltip;
2591 3215
2592our @ISA = CFClient::UI::Bin::; 3216our @ISA = CFPlus::UI::Bin::;
2593 3217
2594use CFClient::OpenGL; 3218use CFPlus::OpenGL;
2595 3219
2596sub new { 3220sub new {
2597 my $class = shift; 3221 my $class = shift;
2598 3222
2599 $class->SUPER::new ( 3223 $class->SUPER::new (
… …
2603} 3227}
2604 3228
2605sub set_tooltip_from { 3229sub set_tooltip_from {
2606 my ($self, $widget) = @_; 3230 my ($self, $widget) = @_;
2607 3231
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
3234
3235 my $tooltip = $widget->{tooltip};
3236
3237 if ($ENV{CFPLUS_DEBUG} & 2) {
3238 $tooltip .= "\n\n" . (ref $widget) . "\n"
3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3240 . "req $widget->{req_w} $widget->{req_h}\n"
3241 . "visible $widget->{visible}";
3242 }
3243
3244 $tooltip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//;
3246
2608 $self->add (new CFClient::UI::Label 3247 $self->add (new CFPlus::UI::Label
2609 markup => $widget->{tooltip}, 3248 markup => $tooltip,
2610 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2611 fontsize => 0.8, 3250 fontsize => 0.8,
2612 fg => [0, 0, 0, 1], 3251 style => 1, # FLAG_INVERSE
2613 ellipsise => 0, 3252 ellipsise => 0,
2614 font => ($widget->{tooltip_font} || $::FONT_PROP), 3253 font => ($widget->{tooltip_font} || $::FONT_PROP),
2615 ); 3254 );
2616} 3255}
2617 3256
… …
2621 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3260 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2622 3261
2623 ($w + 4, $h + 4) 3262 ($w + 4, $h + 4)
2624} 3263}
2625 3264
2626sub size_allocate { 3265sub invoke_size_allocate {
2627 my ($self, $w, $h) = @_; 3266 my ($self, $w, $h) = @_;
2628 3267
2629 $self->SUPER::size_allocate ($w - 4, $h - 4); 3268 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3269}
3270
3271sub invoke_visibility_change {
3272 my ($self, $visible) = @_;
3273
3274 return unless $visible;
3275
3276 $self->{root}->on_post_alloc ("move_$self" => sub {
3277 my $widget = $self->{owner}
3278 or return;
3279
3280 if ($widget->{visible}) {
3281 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3282
3283 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3284 if $x + $self->{w} > $self->{root}{w};
3285
3286 $self->move_abs ($x, $y);
3287 } else {
3288 $self->hide;
3289 }
3290 });
2630} 3291}
2631 3292
2632sub _draw { 3293sub _draw {
2633 my ($self) = @_; 3294 my ($self) = @_;
2634 3295
… …
2651 glVertex $w, $h; 3312 glVertex $w, $h;
2652 glVertex $w, 0; 3313 glVertex $w, 0;
2653 glEnd; 3314 glEnd;
2654 3315
2655 glTranslate 2 - 0.375, 2 - 0.375; 3316 glTranslate 2 - 0.375, 2 - 0.375;
3317
2656 $self->SUPER::_draw; 3318 $self->SUPER::_draw;
2657} 3319}
2658 3320
2659############################################################################# 3321#############################################################################
2660 3322
2661package CFClient::UI::Face; 3323package CFPlus::UI::Face;
2662 3324
2663our @ISA = CFClient::UI::Base::; 3325our @ISA = CFPlus::UI::DrawBG::;
2664 3326
2665use CFClient::OpenGL; 3327use CFPlus::OpenGL;
2666 3328
2667sub new { 3329sub new {
2668 my $class = shift; 3330 my $class = shift;
2669 3331
2670 my $self = $class->SUPER::new ( 3332 my $self = $class->SUPER::new (
3333 size_w => 32,
3334 size_h => 8,
2671 aspect => 1, 3335 aspect => 1,
2672 can_events => 0, 3336 can_events => 0,
2673 @_, 3337 @_,
2674 ); 3338 );
2675 3339
2676 if ($self->{anim} && $self->{animspeed}) { 3340 if ($self->{anim} && $self->{animspeed}) {
2677 Scalar::Util::weaken (my $widget = $self); 3341 CFPlus::weaken (my $widget = $self);
2678 3342
2679 $self->{timer} = Event->timer ( 3343 $self->{timer} = Event->timer (
2680 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2681 hard => 1, 3345 hard => 1,
2682 interval => $self->{animspeed}, 3346 interval => $self->{animspeed},
2683 cb => sub { 3347 cb => sub {
3348 return unless $::CONN;
3349
2684 ++$widget->{frame}; 3350 ++$widget->{frame};
3351 $self->update_face;
2685 $widget->update; 3352 $self->update;
2686 }, 3353 },
2687 ); 3354 );
3355
3356 $self->update_face;
2688 } 3357 }
2689 3358
2690 $self 3359 $self
2691} 3360}
2692 3361
3362sub update_face {
3363 my ($self) = @_;
3364
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
2693sub size_request { 3375sub size_request {
2694 (32, 8) 3376 my ($self) = @_;
3377
3378 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3382 } else {
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3384 $self->realloc;
3385 });
3386 }
3387 }
3388 }
3389
3390 ($self->{size_w} || 8, $self->{size_h} || 8)
2695} 3391}
2696 3392
2697sub update { 3393sub update {
2698 my ($self) = @_; 3394 my ($self) = @_;
2699 3395
… …
2705sub _draw { 3401sub _draw {
2706 my ($self) = @_; 3402 my ($self) = @_;
2707 3403
2708 return unless $::CONN; 3404 return unless $::CONN;
2709 3405
2710 my $face; 3406 $self->SUPER::_draw;
2711 3407
2712 if ($self->{frame}) {
2713 my $anim = $::CONN->{anim}[$self->{anim}]; 3408 my $faceid = $::CONN->{faceid}[$self->{face}]
2714 3409 or return;
2715 $face = $anim->[ $self->{frame} % @$anim ]
2716 if $anim && @$anim;
2717 }
2718 3410
2719 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3411 my $tex = $::CONN->{texture}[$faceid];
2720 3412
2721 if ($tex) { 3413 if ($tex) {
2722 glEnable GL_TEXTURE_2D; 3414 glEnable GL_TEXTURE_2D;
2723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2724 glColor 1, 1, 1, 1; 3416 glColor 0, 0, 0, 1;
2725 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2726 glDisable GL_TEXTURE_2D; 3418 glDisable GL_TEXTURE_2D;
2727 } 3419 }
2728} 3420}
2729 3421
2730sub DESTROY { 3422sub destroy {
2731 my ($self) = @_; 3423 my ($self) = @_;
2732 3424
2733 $self->{timer}->cancel 3425 $self->{timer}->cancel
2734 if $self->{timer}; 3426 if $self->{timer};
2735 3427
2736 $self->SUPER::DESTROY; 3428 $self->SUPER::destroy;
2737} 3429}
2738 3430
2739############################################################################# 3431#############################################################################
2740 3432
2741package CFClient::UI::Inventory; 3433package CFPlus::UI::Buttonbar;
2742 3434
2743our @ISA = CFClient::UI::ScrolledWindow::; 3435our @ISA = CFPlus::UI::HBox::;
2744 3436
2745sub new { 3437# 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 3438
2781############################################################################# 3439#############################################################################
2782 3440
2783package CFClient::UI::Menu; 3441package CFPlus::UI::Menu;
2784 3442
2785our @ISA = CFClient::UI::FancyFrame::; 3443our @ISA = CFPlus::UI::Toplevel::;
2786 3444
2787use CFClient::OpenGL; 3445use CFPlus::OpenGL;
2788 3446
2789sub new { 3447sub new {
2790 my $class = shift; 3448 my $class = shift;
2791 3449
2792 my $self = $class->SUPER::new ( 3450 my $self = $class->SUPER::new (
2793 items => [], 3451 items => [],
2794 z => 100, 3452 z => 100,
2795 @_, 3453 @_,
2796 ); 3454 );
2797 3455
2798 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3456 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2799 3457
2800 for my $item (@{ $self->{items} }) { 3458 for my $item (@{ $self->{items} }) {
2801 my ($widget, $cb) = @$item; 3459 my ($widget, $cb, $tooltip) = @$item;
2802 3460
2803 # handle various types of items, only text for now 3461 # handle various types of items, only text for now
2804 if (!ref $widget) { 3462 if (!ref $widget) {
3463 if ($widget =~ /\t/) {
3464 my ($left, $right) = split /\t/, $widget, 2;
3465
2805 $widget = new CFClient::UI::Label 3466 $widget = new CFPlus::UI::HBox
2806 can_hover => 1, 3467 can_hover => 1,
2807 can_events => 1, 3468 can_events => 1,
3469 tooltip => $tooltip,
3470 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ],
3474 ;
3475
3476 } else {
3477 $widget = new CFPlus::UI::Label
3478 can_hover => 1,
3479 can_events => 1,
2808 text => $widget; 3480 markup => $widget,
3481 tooltip => $tooltip;
3482 }
2809 } 3483 }
2810 3484
2811 $self->{item}{$widget} = $item; 3485 $self->{item}{$widget} = $item;
2812 3486
2813 $self->{vbox}->add ($widget); 3487 $self->{vbox}->add ($widget);
… …
2818 3492
2819# popup given the event (must be a mouse button down event currently) 3493# popup given the event (must be a mouse button down event currently)
2820sub popup { 3494sub popup {
2821 my ($self, $ev) = @_; 3495 my ($self, $ev) = @_;
2822 3496
2823 $self->_emit ("popdown"); 3497 $self->emit ("popdown");
2824 3498
2825 # maybe save $GRAB? must be careful about events... 3499 # maybe save $GRAB? must be careful about events...
2826 $GRAB = $self; 3500 $GRAB = $self;
2827 $self->{button} = $ev->{button}; 3501 $self->{button} = $ev->{button};
2828 3502
2829 $self->show; 3503 $self->show;
2830 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3504 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2831} 3505}
2832 3506
2833sub mouse_motion { 3507sub invoke_mouse_motion {
2834 my ($self, $ev, $x, $y) = @_; 3508 my ($self, $ev, $x, $y) = @_;
2835 3509
2836 # TODO: should use vbox->find_widget or so 3510 # TODO: should use vbox->find_widget or so
2837 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3511 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2838 $self->{hover} = $self->{item}{$HOVER}; 3512 $self->{hover} = $self->{item}{$HOVER};
2839}
2840 3513
3514 0
3515}
3516
2841sub button_up { 3517sub invoke_button_up {
2842 my ($self, $ev, $x, $y) = @_; 3518 my ($self, $ev, $x, $y) = @_;
2843 3519
2844 if ($ev->{button} == $self->{button}) { 3520 if ($ev->{button} == $self->{button}) {
2845 undef $GRAB; 3521 undef $GRAB;
2846 $self->hide; 3522 $self->hide;
2847 3523
2848 $self->_emit ("popdown"); 3524 $self->emit ("popdown");
2849 $self->{hover}[1]->() if $self->{hover}; 3525 $self->{hover}[1]->() if $self->{hover};
3526 } else {
3527 return 0
3528 }
3529
2850 } 3530 1
2851} 3531}
2852 3532
2853############################################################################# 3533#############################################################################
2854 3534
2855package CFClient::UI::Statusbox; 3535package CFPlus::UI::Multiplexer;
2856 3536
2857our @ISA = CFClient::UI::VBox::; 3537our @ISA = CFPlus::UI::Container::;
2858 3538
2859sub new { 3539sub new {
2860 my $class = shift; 3540 my $class = shift;
2861 3541
2862 $class->SUPER::new ( 3542 my $self = $class->SUPER::new (
3543 @_,
3544 );
3545
3546 $self->{current} = $self->{children}[0]
3547 if @{ $self->{children} };
3548
3549 $self
3550}
3551
3552sub add {
3553 my ($self, @widgets) = @_;
3554
3555 $self->SUPER::add (@widgets);
3556
3557 $self->{current} = $self->{children}[0]
3558 if @{ $self->{children} };
3559}
3560
3561sub get_current_page {
3562 my ($self) = @_;
3563
3564 $self->{current}
3565}
3566
3567sub set_current_page {
3568 my ($self, $page_or_widget) = @_;
3569
3570 my $widget = ref $page_or_widget
3571 ? $page_or_widget
3572 : $self->{children}[$page_or_widget];
3573
3574 $self->{current} = $widget;
3575 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3576
3577 $self->emit (page_changed => $self->{current});
3578
3579 $self->realloc;
3580}
3581
3582sub visible_children {
3583 $_[0]{current}
3584}
3585
3586sub size_request {
3587 my ($self) = @_;
3588
3589 $self->{current}->size_request
3590}
3591
3592sub invoke_size_allocate {
3593 my ($self, $w, $h) = @_;
3594
3595 $self->{current}->configure (0, 0, $w, $h);
3596
3597 1
3598}
3599
3600sub _draw {
3601 my ($self) = @_;
3602
3603 $self->{current}->draw;
3604}
3605
3606#############################################################################
3607
3608package CFPlus::UI::Notebook;
3609
3610our @ISA = CFPlus::UI::VBox::;
3611
3612sub new {
3613 my $class = shift;
3614
3615 my $self = $class->SUPER::new (
3616 buttonbar => (new CFPlus::UI::Buttonbar),
3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3618 # filter => # will be put between multiplexer and $self
3619 @_,
3620 );
3621
3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3623 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3624
3625 $self
3626}
3627
3628sub add {
3629 my ($self, $title, $widget, $tooltip) = @_;
3630
3631 CFPlus::weaken $self;
3632
3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3634 markup => $title,
3635 tooltip => $tooltip,
3636 on_activate => sub { $self->set_current_page ($widget) },
3637 );
3638
3639 $self->{multiplexer}->add ($widget);
3640}
3641
3642sub get_current_page {
3643 my ($self) = @_;
3644
3645 $self->{multiplexer}->get_current_page
3646}
3647
3648sub set_current_page {
3649 my ($self, $page) = @_;
3650
3651 $self->{multiplexer}->set_current_page ($page);
3652 $self->emit (page_changed => $self->{multiplexer}{current});
3653}
3654
3655#############################################################################
3656
3657package CFPlus::UI::Selector;
3658
3659use utf8;
3660
3661our @ISA = CFPlus::UI::Button::;
3662
3663sub new {
3664 my $class = shift;
3665
3666 my $self = $class->SUPER::new (
3667 options => [], # [value, title, longdesc], ...
3668 value => undef,
3669 @_,
3670 );
3671
3672 $self->_set_value ($self->{value});
3673
3674 $self
3675}
3676
3677sub invoke_button_down {
3678 my ($self, $ev) = @_;
3679
3680 my @menu_items;
3681
3682 for (@{ $self->{options} }) {
3683 my ($value, $title, $tooltip) = @$_;
3684
3685 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3686 }
3687
3688 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3689}
3690
3691sub _set_value {
3692 my ($self, $value) = @_;
3693
3694 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3695 or return;
3696
3697 $self->{value} = $item->[0];
3698 $self->set_markup ("$item->[1] ⇓");
3699 $self->set_tooltip ($item->[2]);
3700}
3701
3702sub set_value {
3703 my ($self, $value) = @_;
3704
3705 return unless $self->{value} ne $value;
3706
3707 $self->_set_value ($value);
3708 $self->emit (changed => $value);
3709}
3710
3711#############################################################################
3712
3713package CFPlus::UI::Statusbox;
3714
3715our @ISA = CFPlus::UI::VBox::;
3716
3717sub new {
3718 my $class = shift;
3719
3720 my $self = $class->SUPER::new (
2863 fontsize => 0.8, 3721 fontsize => 0.8,
2864 @_, 3722 @_,
2865 ) 3723 );
3724
3725 CFPlus::weaken (my $this = $self);
3726
3727 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3728
3729 $self
2866} 3730}
2867 3731
2868sub reorder { 3732sub reorder {
2869 my ($self) = @_; 3733 my ($self) = @_;
2870 my $NOW = time; 3734 my $NOW = Time::HiRes::time;
3735
3736 # freeze display when hovering over any label
3737 return if $CFPlus::UI::TOOLTIP->{owner}
3738 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3739 values %{ $self->{item} };
2871 3740
2872 while (my ($k, $v) = each %{ $self->{item} }) { 3741 while (my ($k, $v) = each %{ $self->{item} }) {
2873 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3742 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2874 } 3743 }
2875 3744
… …
2878 my @items = sort { 3747 my @items = sort {
2879 $a->{pri} <=> $b->{pri} 3748 $a->{pri} <=> $b->{pri}
2880 or $b->{id} <=> $a->{id} 3749 or $b->{id} <=> $a->{id}
2881 } values %{ $self->{item} }; 3750 } values %{ $self->{item} };
2882 3751
3752 $self->{timer}->interval (1);
3753
2883 my $count = 10 + 1; 3754 my $count = 10 + 1;
2884 for my $item (@items) { 3755 for my $item (@items) {
2885 last unless --$count; 3756 last unless --$count;
2886 3757
2887 push @widgets, $item->{label} ||= do { 3758 my $label = $item->{label} ||= do {
2888 # TODO: doesn't handle markup well (read as: at all) 3759 # TODO: doesn't handle markup well (read as: at all)
2889 my $short = $item->{count} > 1 3760 my $short = $item->{count} > 1
2890 ? "<b>$item->{count} ×</b> $item->{text}" 3761 ? "<b>$item->{count} ×</b> $item->{text}"
2891 : $item->{text}; 3762 : $item->{text};
2892 3763
2893 for ($short) { 3764 for ($short) {
2894 s/^\s+//; 3765 s/^\s+//;
2895 s/\s+/ /g; 3766 s/\s+/ /g;
2896 } 3767 }
2897 3768
2898 new CFClient::UI::Label 3769 new CFPlus::UI::Label
2899 markup => $short, 3770 markup => $short,
2900 tooltip => $item->{tooltip}, 3771 tooltip => $item->{tooltip},
2901 tooltip_font => $::FONT_PROP, 3772 tooltip_font => $::FONT_PROP,
2902 tooltip_width => 0.67, 3773 tooltip_width => 0.67,
2903 fontsize => $item->{fontsize} || $self->{fontsize}, 3774 fontsize => $item->{fontsize} || $self->{fontsize},
2904 max_w => $::WIDTH * 0.44, 3775 max_w => $::WIDTH * 0.44,
2905 fg => $item->{fg}, 3776 fg => [@{ $item->{fg} }],
2906 can_events => 1, 3777 can_events => 1,
2907 can_hover => 1 3778 can_hover => 1
2908 }; 3779 };
3780
3781 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3782 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3783 $label->update;
3784 $label->set_max_size (undef, $label->{req_h} * $diff)
3785 if $diff < 1;
3786 $self->{timer}->interval (1/30);
3787 } else {
3788 $label->{fg}[3] = $item->{fg}[3] || 1;
3789 }
3790
3791 push @widgets, $label;
2909 } 3792 }
2910 3793
2911 $self->clear; 3794 $self->clear;
2912 $self->SUPER::add (reverse @widgets); 3795 $self->SUPER::add (reverse @widgets);
2913} 3796}
… …
2918 $text =~ s/^\s+//; 3801 $text =~ s/^\s+//;
2919 $text =~ s/\s+$//; 3802 $text =~ s/\s+$//;
2920 3803
2921 return unless $text; 3804 return unless $text;
2922 3805
2923 my $timeout = time + ((delete $arg{timeout}) || 60); 3806 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2924 3807
2925 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3808 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2926 3809
2927 if (my $item = $self->{item}{$group}) { 3810 if (my $item = $self->{item}{$group}) {
2928 if ($item->{text} eq $text) { 3811 if ($item->{text} eq $text) {
2929 $item->{count}++; 3812 $item->{count}++;
2930 } else { 3813 } else {
2931 $item->{count} = 1; 3814 $item->{count} = 1;
2932 $item->{text} = $item->{tooltip} = $text; 3815 $item->{text} = $item->{tooltip} = $text;
2933 } 3816 }
2934 $item->{id} = ++$self->{id}; 3817 $item->{id} += 0.2;#d#
2935 $item->{timeout} = $timeout; 3818 $item->{timeout} = $timeout;
2936 delete $item->{label}; 3819 delete $item->{label};
2937 } else { 3820 } else {
2938 $self->{item}{$group} = { 3821 $self->{item}{$group} = {
2939 id => ++$self->{id}, 3822 id => ++$self->{id},
… …
2945 count => 1, 3828 count => 1,
2946 %arg, 3829 %arg,
2947 }; 3830 };
2948 } 3831 }
2949 3832
3833 $ROOT->on_refresh (reorder => sub {
2950 $self->reorder; 3834 $self->reorder;
3835 });
2951} 3836}
2952 3837
2953sub reconfigure { 3838sub reconfigure {
2954 my ($self) = @_; 3839 my ($self) = @_;
2955 3840
… …
2958 3843
2959 $self->reorder; 3844 $self->reorder;
2960 $self->SUPER::reconfigure; 3845 $self->SUPER::reconfigure;
2961} 3846}
2962 3847
3848sub destroy {
3849 my ($self) = @_;
3850
3851 $self->{timer}->cancel;
3852
3853 $self->SUPER::destroy;
3854}
3855
2963############################################################################# 3856#############################################################################
2964 3857
2965package CFClient::UI::Root; 3858package CFPlus::UI::Root;
2966 3859
2967our @ISA = CFClient::UI::Container::; 3860our @ISA = CFPlus::UI::Container::;
2968 3861
3862use List::Util qw(min max);
3863
2969use CFClient::OpenGL; 3864use CFPlus::OpenGL;
2970 3865
2971sub new { 3866sub new {
2972 my $class = shift; 3867 my $class = shift;
2973 3868
2974 $class->SUPER::new ( 3869 my $self = $class->SUPER::new (
2975 visible => 1, 3870 visible => 1,
2976 @_, 3871 @_,
2977 ) 3872 );
2978}
2979 3873
2980sub configure { 3874 CFPlus::weaken ($self->{root} = $self);
2981 my ($self, $x, $y, $w, $h) = @_;
2982 3875
2983 $self->{w} = $w; 3876 $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} 3877}
2993 3878
2994sub size_request { 3879sub size_request {
2995 my ($self) = @_; 3880 my ($self) = @_;
2996 3881
2997 ($self->{w}, $self->{h}) 3882 ($self->{w}, $self->{h})
2998} 3883}
2999 3884
3885sub _to_pixel {
3886 my ($coord, $size, $max) = @_;
3887
3888 $coord =
3889 $coord eq "center" ? ($max - $size) * 0.5
3890 : $coord eq "max" ? $max
3891 : $coord;
3892
3893 $coord = 0 if $coord < 0;
3894 $coord = $max - $size if $coord > $max - $size;
3895
3896 int $coord + 0.5
3897}
3898
3000sub size_allocate { 3899sub invoke_size_allocate {
3001 my ($self, $w, $h) = @_; 3900 my ($self, $w, $h) = @_;
3002 3901
3003 for my $child ($self->children) { 3902 for my $child ($self->children) {
3004 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3903 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3005 3904
3006 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3905 $X = $child->{force_x} if exists $child->{force_x};
3007 if exists $child->{req_x}; 3906 $Y = $child->{force_y} if exists $child->{force_y};
3008 3907
3009 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3908 $X = _to_pixel $X, $W, $self->{w};
3010 if exists $child->{req_y}; 3909 $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 3910
3017 $child->configure ($X, $Y, $W, $H); 3911 $child->configure ($X, $Y, $W, $H);
3018 } 3912 }
3913
3914 1
3019} 3915}
3020 3916
3021sub coord2local { 3917sub coord2local {
3022 my ($self, $x, $y) = @_; 3918 my ($self, $x, $y) = @_;
3023 3919
… …
3031} 3927}
3032 3928
3033sub update { 3929sub update {
3034 my ($self) = @_; 3930 my ($self) = @_;
3035 3931
3036 $self->check_size;
3037 $::WANT_REFRESH++; 3932 $::WANT_REFRESH++;
3038} 3933}
3039 3934
3040sub add { 3935sub add {
3041 my ($self, @children) = @_; 3936 my ($self, @children) = @_;
3042 3937
3043 for my $child (@children) {
3044 $child->{is_toplevel} = 1; 3938 $_->{is_toplevel} = 1
3045 3939 for @children;
3046 # integerise window positions
3047 $child->{x} = int $child->{x};
3048 $child->{y} = int $child->{y};
3049 }
3050 3940
3051 $self->SUPER::add (@children); 3941 $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} 3942}
3059 3943
3060sub remove { 3944sub remove {
3061 my ($self, @children) = @_; 3945 my ($self, @children) = @_;
3062 3946
3063 $self->SUPER::remove (@children); 3947 $self->SUPER::remove (@children);
3948
3949 delete $self->{is_toplevel}
3950 for @children;
3064 3951
3065 while (@children) { 3952 while (@children) {
3066 my $w = pop @children; 3953 my $w = pop @children;
3067 push @children, $w->children; 3954 push @children, $w->children;
3068 $w->set_invisible; 3955 $w->set_invisible;
… …
3087 while ($self->{refresh_hook}) { 3974 while ($self->{refresh_hook}) {
3088 $_->() 3975 $_->()
3089 for values %{delete $self->{refresh_hook}}; 3976 for values %{delete $self->{refresh_hook}};
3090 } 3977 }
3091 3978
3092 if ($self->{check_size}) { 3979 if ($self->{realloc}) {
3980 my %queue;
3093 my @queue; 3981 my @queue;
3982 my $widget;
3094 3983
3095 for (;;) { 3984 outer:
3096 if ($self->{check_size}) { 3985 while () {
3097 #TODO use array-of-depth approach 3986 if (my $realloc = delete $self->{realloc}) {
3987 for $widget (values %$realloc) {
3988 $widget->{visible} or next; # do not resize invisible widgets
3098 3989
3099 @queue = sort { $a->{visible} <=> $b->{visible} } 3990 $queue{$widget+0}++ and next; # duplicates are common
3100 @queue, values %{delete $self->{check_size}}; 3991
3992 push @{ $queue[$widget->{visible}] }, $widget;
3993 }
3101 } 3994 }
3102 3995
3996 while () {
3997 @queue or last outer;
3998
3103 my $widget = pop @queue || last; 3999 $widget = pop @{ $queue[-1] || [] }
3104 4000 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 4001
4002 pop @queue;
4003 }
4004
4005 delete $queue{$widget+0};
4006
4007 my ($w, $h) = $widget->size_request;
4008
4009 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4010 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4011
4012 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4013 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4014
4015 $w = $widget->{force_w} if exists $widget->{force_w};
4016 $h = $widget->{force_h} if exists $widget->{force_h};
4017
4018 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4019 || delete $widget->{force_realloc}) {
3115 $widget->{req_w} = $w; 4020 $widget->{req_w} = $w;
3116 $widget->{req_h} = $h; 4021 $widget->{req_h} = $h;
3117 4022
3118 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4023 $self->{size_alloc}{$widget+0} = $widget;
3119 4024
3120 $widget->{parent}->check_size
3121 if $widget->{parent}; 4025 if (my $parent = $widget->{parent}) {
4026 $self->{realloc}{$parent+0} = $parent
4027 unless $queue{$parent+0};
4028
4029 $parent->{force_size_alloc} = 1;
4030 $self->{size_alloc}{$parent+0} = $parent;
4031 }
3122 } 4032 }
4033
4034 delete $self->{realloc}{$widget+0};
3123 } 4035 }
3124 } 4036 }
3125 4037
3126 while ($self->{size_alloc}) { 4038 while (my $size_alloc = delete $self->{size_alloc}) {
3127 for (values %{delete $self->{size_alloc}}) { 4039 my @queue = sort { $b->{visible} <=> $a->{visible} }
3128 my ($widget, $w, $h) = @$_; 4040 values %$size_alloc;
4041
4042 while () {
4043 my $widget = pop @queue || last;
4044
4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3129 4046
3130 $w = 0 if $w < 0; 4047 $w = 0 if $w < 0;
3131 $h = 0 if $h < 0; 4048 $h = 0 if $h < 0;
3132 4049
4050 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h;
4052
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4058
4059 $w = int $w + 0.5;
4060 $h = int $h + 0.5;
4061
4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4063 $widget->{old_w} = $widget->{w};
4064 $widget->{old_h} = $widget->{h};
4065
3133 $widget->{w} = $w; 4066 $widget->{w} = $w;
3134 $widget->{h} = $h; 4067 $widget->{h} = $h;
4068
3135 $widget->emit (size_allocate => $w, $h); 4069 $widget->emit (size_allocate => $w, $h);
4070 }
3136 } 4071 }
3137 } 4072 }
3138 4073
3139 while ($self->{post_alloc_hook}) { 4074 while ($self->{post_alloc_hook}) {
3140 $_->() 4075 $_->()
3141 for values %{delete $self->{post_alloc_hook}}; 4076 for values %{delete $self->{post_alloc_hook}};
3142 } 4077 }
4078
3143 4079
3144 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4080 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3145 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4081 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3146 glClear GL_COLOR_BUFFER_BIT; 4082 glClear GL_COLOR_BUFFER_BIT;
3147 4083
… …
3149 glLoadIdentity; 4085 glLoadIdentity;
3150 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4086 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3151 glMatrixMode GL_MODELVIEW; 4087 glMatrixMode GL_MODELVIEW;
3152 glLoadIdentity; 4088 glLoadIdentity;
3153 4089
4090 {
4091 package CFPlus::UI::Base;
4092
4093 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4094 (0, 0, $self->{w}, $self->{h});
4095
3154 $self->_draw; 4096 $self->_draw;
4097 }
3155} 4098}
3156 4099
3157############################################################################# 4100#############################################################################
3158 4101
3159package CFClient::UI; 4102package CFPlus::UI;
3160 4103
3161$ROOT = new CFClient::UI::Root; 4104$ROOT = new CFPlus::UI::Root;
3162$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4105$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3163 4106
31641 41071
3165 4108

Diff Legend

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