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

Diff Legend

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