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

Diff Legend

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