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

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

Diff Legend

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