ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.247 by root, Sun May 28 01:16:04 2006 UTC vs.
Revision 1.376 by root, Mon Jul 16 20:20:23 2007 UTC

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

Diff Legend

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