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

Diff Legend

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