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

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

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

Diff Legend

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