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

Diff Legend

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