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.330 by root, Sun Jul 23 04:37:51 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
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 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
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;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
187} 216}
188 217
189############################################################################# 218#############################################################################
190 219
191package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
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 Scalar::Util::weaken ($CFClient::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 = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 248 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 249 $self->{y} = $layout->{y} * $CFClient::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} * $CFClient::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} * $CFClient::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}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 260}
235 261
236sub destroy { 262sub destroy {
237 my ($self) = @_; 263 my ($self) = @_;
238 264
… …
240 %$self = (); 266 %$self = ();
241} 267}
242 268
243sub show { 269sub show {
244 my ($self) = @_; 270 my ($self) = @_;
271
245 return if $self->{parent}; 272 return if $self->{parent};
246 273
247 $CFClient::UI::ROOT->add ($self); 274 $CFClient::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} 275}
262 276
263sub set_visible { 277sub set_visible {
264 my ($self) = @_; 278 my ($self) = @_;
265 279
266 return if $self->{visible}; 280 return if $self->{visible};
267 281
268 $self->{root} = $self->{parent}{root}; 282 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 283 $self->{visible} = $self->{parent}{visible} + 1;
270 284
271 $self->emit (visibility_change => 1) 285 $self->emit (visibility_change => 1);
286
287 $self->realloc if !exists $self->{req_w};
288
289 $_->set_visible for $self->children;
272} 290}
273 291
274sub set_invisible { 292sub set_invisible {
275 my ($self) = @_; 293 my ($self) = @_;
276 294
277 return unless $self->{visible}; 295 return unless $self->{visible};
278 296
279 # broken show/hide model 297 $_->set_invisible for $self->children;
280 298
299 delete $self->{visible};
281 delete $self->{root}; 300 delete $self->{root};
282 delete $self->{visible};
283 301
284 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
286 304
287 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
289 307
290 $self->focus_out; 308 $self->emit ("focus_out");
291
292 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
310}
311
312sub set_visibility {
313 my ($self, $visible) = @_;
314
315 return if $self->{visible} == $visible;
316
317 $visible ? $self->hide
318 : $self->show;
319}
320
321sub toggle_visibility {
322 my ($self) = @_;
323
324 $self->{visible}
325 ? $self->hide
326 : $self->show;
293} 327}
294 328
295sub hide { 329sub hide {
296 my ($self) = @_; 330 my ($self) = @_;
297 331
… …
299 333
300 $self->{parent}->remove ($self) 334 $self->{parent}->remove ($self)
301 if $self->{parent}; 335 if $self->{parent};
302} 336}
303 337
304sub move { 338sub move_abs {
305 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
306 340
307 $self->{x} = int $x; 341 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
308 $self->{y} = int $y; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
309 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
310 344
311 $self->update; 345 $self->update;
312} 346}
313 347
314sub set_size { 348sub set_size {
315 my ($self, $w, $h) = @_; 349 my ($self, $w, $h) = @_;
316 350
317 $self->{def_w} = $w; 351 $self->{force_w} = $w;
318 $self->{def_h} = $h; 352 $self->{force_h} = $h;
319 353
320 $self->check_size; 354 $self->realloc;
321} 355}
322 356
323sub size_request { 357sub size_request {
324 require Carp; 358 require Carp;
325 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
326} 360}
327 361
362sub baseline_shift {
363 0
364}
365
328sub configure { 366sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
330 368
331 if ($self->{aspect}) { 369 if ($self->{aspect}) {
370 my ($ow, $oh) = ($w, $h);
371
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 372 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 373 $h = List::Util::min $h, int $w / $self->{aspect};
334 374
335 # use alignment to adjust x, y 375 # use alignment to adjust x, y
336 376
337 $x += int +($w - $w2) * 0.5; 377 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 378 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 379 }
342 380
343 if ($self->{x} != $x || $self->{y} != $y) { 381 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 382 $self->{x} = $x;
345 $self->{y} = $y; 383 $self->{y} = $y;
346 $self->update; 384 $self->update;
347 } 385 }
348 386
349 if ($self->{w} != $w || $self->{h} != $h) { 387 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 388 return unless $self->{visible};
351 }
352}
353 389
354sub size_allocate { 390 $self->{alloc_w} = $w;
355 # nothing to be done 391 $self->{alloc_h} = $h;
356}
357 392
358sub reconfigure { 393 $self->{root}{size_alloc}{$self+0} = $self;
359 my ($self) = @_; 394 }
360
361 $self->check_size (1);
362 $self->update;
363} 395}
364 396
365sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
366} 403}
367 404
368sub set_max_size { 405sub set_max_size {
369 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
370 407
371 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
372 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
373} 412}
374 413
375sub set_tooltip { 414sub set_tooltip {
376 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
377 416
… …
382 421
383 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
384 423
385 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
386 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
387 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
388 } 427 }
389} 428}
390 429
391# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
392sub coord2local { 431sub coord2local {
… …
400 my ($self, $x, $y) = @_; 439 my ($self, $x, $y) = @_;
401 440
402 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 441 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
403} 442}
404 443
405sub focus_in { 444sub invoke_focus_in {
406 my ($self) = @_; 445 my ($self) = @_;
407 446
408 return if $FOCUS == $self; 447 return if $FOCUS == $self;
409 return unless $self->{can_focus}; 448 return unless $self->{can_focus};
410 449
411 my $focus = $FOCUS; $FOCUS = $self; 450 $FOCUS = $self;
412 451
413 $self->_emit (focus_in => $focus); 452 $self->update;
414 453
415 $focus->update if $focus; 454 0
416 $FOCUS->update;
417} 455}
418 456
419sub focus_out { 457sub invoke_focus_out {
420 my ($self) = @_; 458 my ($self) = @_;
421 459
422 return unless $FOCUS == $self; 460 return unless $FOCUS == $self;
423 461
424 my $focus = $FOCUS; undef $FOCUS; 462 undef $FOCUS;
425 463
426 $self->_emit (focus_out => $focus); 464 $self->update;
427 465
428 $focus->update if $focus; #?
429
430 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 466 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
431 unless $FOCUS; 467 unless $FOCUS;
432}
433 468
469 0
470}
471
472sub grab_focus {
473 my ($self) = @_;
474
475 $FOCUS->emit ("focus_out") if $FOCUS;
476 $self->emit ("focus_in");
477}
478
434sub mouse_motion { } 479sub invoke_mouse_motion { 0 }
435sub button_up { } 480sub invoke_button_up { 0 }
436sub key_down { } 481sub invoke_key_down { 0 }
437sub key_up { } 482sub invoke_key_up { 0 }
483sub invoke_mouse_wheel { 0 }
438 484
439sub button_down { 485sub invoke_button_down {
440 my ($self, $ev, $x, $y) = @_; 486 my ($self, $ev, $x, $y) = @_;
441 487
442 $self->focus_in; 488 $self->grab_focus;
443}
444 489
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 490 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 491}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 492
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 493sub connect {
449sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 494 my ($self, $signal, $cb) = @_;
495
496 push @{ $self->{signal_cb}{$signal} }, $cb;
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 my @append
503 = ref $args[0] && $args[0]->isa ("CFClient::UI::Event")
504 ? $args[0]->xy ($self)
505 : ();
506
507 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508
509 #d##TODO# stop propagating at first true, do not use sum
510 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
511 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
513}
514
515sub find_widget {
516 my ($self, $x, $y) = @_;
517
518 return () unless $self->{can_events};
519
520 return $self
521 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524 ()
525}
526
527sub set_parent {
528 my ($self, $parent) = @_;
529
530 Scalar::Util::weaken ($self->{parent} = $parent);
531 $self->set_visible if $parent->{visible};
532}
533
534sub realloc {
535 my ($self) = @_;
536
537 if ($self->{visible}) {
538 return if $self->{root}{realloc}{$self+0};
539
540 $self->{root}{realloc}{$self+0} = $self;
541 $self->{root}->update;
542 } else {
543 delete $self->{req_w};
544 delete $self->{req_h};
545 }
546}
547
548sub update {
549 my ($self) = @_;
550
551 $self->{parent}->update
552 if $self->{parent};
553}
554
555sub reconfigure {
556 my ($self) = @_;
557
558 $self->realloc;
559 $self->update;
560}
561
562# using global variables seems a bit hacky, but passing through all drawing
563# functions seems pointless.
564our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
450 565
451sub draw { 566sub draw {
452 my ($self) = @_; 567 my ($self) = @_;
453 568
454 return unless $self->{h} && $self->{w}; 569 return unless $self->{h} && $self->{w};
570
571 # update screen rectangle
572 local $draw_x = $draw_x + $self->{x};
573 local $draw_y = $draw_y + $self->{y};
574
575 # skip widgets that are entirely outside the drawing area
576 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
577 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
455 578
456 glPushMatrix; 579 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 580 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 581
461 if ($self == $HOVER && $self->{can_hover}) { 582 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 583 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 584 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 586 glBegin GL_QUADS;
468 glVertex $x , $y; 587 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 588 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 589 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 590 glVertex 0 , $self->{h};
472 glEnd; 591 glEnd;
473 glDisable GL_BLEND; 592 glDisable GL_BLEND;
474 } 593 }
475 594
476 if ($ENV{PCLIENT_DEBUG}) { 595 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 596 glPushMatrix;
478 glColor 1, 1, 0, 1; 597 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 598 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 599 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 600 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 601 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 602 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 603 glVertex 0 , $self->{h} - 1;
485 glEnd; 604 glEnd;
486 glPopMatrix; 605 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 606 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 607 }
608
609 $self->_draw;
610 glPopMatrix;
489} 611}
490 612
491sub _draw { 613sub _draw {
492 my ($self) = @_; 614 my ($self) = @_;
493 615
494 warn "no draw defined for $self\n"; 616 warn "no draw defined for $self\n";
495} 617}
496 618
497sub find_widget {
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 { 619sub DESTROY {
558 my ($self) = @_; 620 my ($self) = @_;
559 621
622 return if CFClient::in_destruct;
623
560 delete $WIDGET{$self+0}; 624 delete $WIDGET{$self+0};
561 #$self->deactivate; 625
626 eval { $self->destroy };
627 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
562} 628}
563 629
564############################################################################# 630#############################################################################
565 631
566package CFClient::UI::DrawBG; 632package CFClient::UI::DrawBG;
… …
591 657
592 if ($color && (@$color < 4 || $color->[3])) { 658 if ($color && (@$color < 4 || $color->[3])) {
593 my ($w, $h) = @$self{qw(w h)}; 659 my ($w, $h) = @$self{qw(w h)};
594 660
595 glEnable GL_BLEND; 661 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 662 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
597 glColor @$color; 663 glColor_premultiply @$color;
598 664
599 glBegin GL_QUADS; 665 glBegin GL_QUADS;
600 glVertex 0 , 0; 666 glVertex 0 , 0;
601 glVertex 0 , $h; 667 glVertex 0 , $h;
602 glVertex $w, $h; 668 glVertex $w, $h;
… …
617 my ($class, %arg) = @_; 683 my ($class, %arg) = @_;
618 $class->SUPER::new (can_events => 0, %arg); 684 $class->SUPER::new (can_events => 0, %arg);
619} 685}
620 686
621sub size_request { 687sub size_request {
622 (0, 0) 688 my ($self) = @_;
689
690 ($self->{w} + 0, $self->{h} + 0)
623} 691}
624 692
625sub draw { } 693sub draw { }
626 694
627############################################################################# 695#############################################################################
… …
631our @ISA = CFClient::UI::Base::; 699our @ISA = CFClient::UI::Base::;
632 700
633sub new { 701sub new {
634 my ($class, %arg) = @_; 702 my ($class, %arg) = @_;
635 703
636 my $children = delete $arg{children} || []; 704 my $children = delete $arg{children};
637 705
638 my $self = $class->SUPER::new ( 706 my $self = $class->SUPER::new (
639 children => [], 707 children => [],
640 can_events => 0, 708 can_events => 0,
641 %arg, 709 %arg,
642 ); 710 );
711
643 $self->add ($_) for @$children; 712 $self->add (@$children)
713 if $children;
644 714
645 $self 715 $self
646} 716}
647 717
648sub add { 718sub add {
… …
656 $self->{children} = [ 726 $self->{children} = [
657 sort { $a->{z} <=> $b->{z} } 727 sort { $a->{z} <=> $b->{z} }
658 @{$self->{children}}, @widgets 728 @{$self->{children}}, @widgets
659 ]; 729 ];
660 730
661 $self->check_size (1); 731 $self->realloc;
662 $self->update;
663} 732}
664 733
665sub children { 734sub children {
666 @{ $_[0]{children} } 735 @{ $_[0]{children} }
667} 736}
… …
672 delete $child->{parent}; 741 delete $child->{parent};
673 $child->hide; 742 $child->hide;
674 743
675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 744 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
676 745
677 $self->check_size (1); 746 $self->realloc;
678 $self->update;
679} 747}
680 748
681sub clear { 749sub clear {
682 my ($self) = @_; 750 my ($self) = @_;
683 751
… …
687 for (@$children) { 755 for (@$children) {
688 delete $_->{parent}; 756 delete $_->{parent};
689 $_->hide; 757 $_->hide;
690 } 758 }
691 759
692 $self->check_size; 760 $self->realloc;
693 $self->update;
694} 761}
695 762
696sub find_widget { 763sub find_widget {
697 my ($self, $x, $y) = @_; 764 my ($self, $x, $y) = @_;
698 765
699 $x -= $self->{x}; 766 $x -= $self->{x};
700 $y -= $self->{y}; 767 $y -= $self->{y};
701 768
702 my $res; 769 my $res;
703 770
704 for (reverse @{ $self->{children} }) { 771 for (reverse $self->visible_children) {
705 $res = $_->find_widget ($x, $y) 772 $res = $_->find_widget ($x, $y)
706 and return $res; 773 and return $res;
707 } 774 }
708 775
709 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 776 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
730} 797}
731 798
732sub add { 799sub add {
733 my ($self, $child) = @_; 800 my ($self, $child) = @_;
734 801
735 $self->{children} = []; 802 $self->SUPER::remove ($_) for @{ $self->{children} };
736
737 $self->SUPER::add ($child); 803 $self->SUPER::add ($child);
738} 804}
739 805
740sub remove { 806sub remove {
741 my ($self, $widget) = @_; 807 my ($self, $widget) = @_;
… …
750 816
751sub size_request { 817sub size_request {
752 $_[0]{children}[0]->size_request 818 $_[0]{children}[0]->size_request
753} 819}
754 820
755sub size_allocate { 821sub invoke_size_allocate {
756 my ($self, $w, $h) = @_; 822 my ($self, $w, $h) = @_;
757 823
758 $self->{children}[0]->configure (0, 0, $w, $h); 824 $self->{children}[0]->configure (0, 0, $w, $h);
825
826 1
759} 827}
760 828
761############################################################################# 829#############################################################################
830
831# back-buffered drawing area
762 832
763package CFClient::UI::Window; 833package CFClient::UI::Window;
764 834
765our @ISA = CFClient::UI::Bin::; 835our @ISA = CFClient::UI::Bin::;
766 836
… …
777 847
778 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 848 $ROOT->on_post_alloc ($self => sub { $self->render_child });
779 $self->SUPER::update; 849 $self->SUPER::update;
780} 850}
781 851
782sub size_allocate { 852sub invoke_size_allocate {
783 my ($self, $w, $h) = @_; 853 my ($self, $w, $h) = @_;
784 854
785 $self->SUPER::size_allocate ($w, $h);
786 $self->update; 855 $self->update;
856
857 $self->SUPER::invoke_size_allocate ($w, $h)
787} 858}
788 859
789sub _render { 860sub _render {
861 my ($self) = @_;
862
790 $_[0]{children}[0]->draw; 863 $self->{children}[0]->draw;
791} 864}
792 865
793sub render_child { 866sub render_child {
794 my ($self) = @_; 867 my ($self) = @_;
795 868
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 869 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 870 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 871 glClear GL_COLOR_BUFFER_BIT;
799 872
873 {
874 package CFClient::UI::Base;
875
876 ($draw_x, $draw_y, $draw_w, $draw_h) =
877 (0, 0, $self->{w}, $self->{h});
878 }
879
800 $self->_render; 880 $self->_render;
801 }; 881 };
802} 882}
803 883
804sub _draw { 884sub _draw {
805 my ($self) = @_; 885 my ($self) = @_;
806 886
807 my ($w, $h) = ($self->w, $self->h); 887 my ($w, $h) = @$self{qw(w h)};
808 888
809 my $tex = $self->{texture} 889 my $tex = $self->{texture}
810 or return; 890 or return;
811 891
812 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 894 glColor 0, 0, 0, 1;
815 895
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 897
818 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
819} 899}
… …
835} 915}
836 916
837sub size_request { 917sub size_request {
838 my ($self) = @_; 918 my ($self) = @_;
839 919
840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 920 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 921
842 @$self{qw(child_w child_h)} 922 $w = 10 if $self->{scroll_x};
843} 923 $h = 10 if $self->{scroll_y};
844 924
925 ($w, $h)
926}
927
845sub size_allocate { 928sub invoke_size_allocate {
846 my ($self, $w, $h) = @_; 929 my ($self, $w, $h) = @_;
847 930
931 my $child = $self->child;
932
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 933 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 934 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
850 935
851 $self->child->configure (0, 0, $w, $h); 936 $self->child->configure (0, 0, $w, $h);
852 $self->update; 937 $self->update;
938
939 1
853} 940}
854 941
855sub set_offset { 942sub set_offset {
856 my ($self, $x, $y) = @_; 943 my ($self, $x, $y) = @_;
857 944
… …
890} 977}
891 978
892sub _render { 979sub _render {
893 my ($self) = @_; 980 my ($self) = @_;
894 981
982 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
983 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
984
895 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 985 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
896 986
897 $self->SUPER::_render; 987 $self->SUPER::_render;
898} 988}
899 989
… …
902package CFClient::UI::ScrolledWindow; 992package CFClient::UI::ScrolledWindow;
903 993
904our @ISA = CFClient::UI::HBox::; 994our @ISA = CFClient::UI::HBox::;
905 995
906sub new { 996sub new {
907 my $class = shift; 997 my ($class, %arg) = @_;
998
999 my $child = delete $arg{child};
908 1000
909 my $self; 1001 my $self;
910 1002
911 my $slider = new CFClient::UI::Slider 1003 my $slider = new CFClient::UI::Slider
912 vertical => 1, 1004 vertical => 1,
… …
915 $self->{vp}->set_offset (0, $_[1]); 1007 $self->{vp}->set_offset (0, $_[1]);
916 }, 1008 },
917 ; 1009 ;
918 1010
919 $self = $class->SUPER::new ( 1011 $self = $class->SUPER::new (
920 vp => (new CFClient::UI::ViewPort expand => 1), 1012 vp => (new CFClient::UI::ViewPort expand => 1),
1013 can_events => 1,
921 slider => $slider, 1014 slider => $slider,
922 @_, 1015 %arg,
923 ); 1016 );
924 1017
925 $self->{vp}->add ($self->{scrolled});
926 $self->add ($self->{vp});
927 $self->add ($self->{slider}); 1018 $self->SUPER::add ($self->{vp}, $self->{slider});
1019 $self->add ($child) if $child;
928 1020
929 $self 1021 $self
930} 1022}
931 1023
1024#TODO# update range on size_allocate depending on child
1025
1026sub add {
1027 my ($self, $widget) = @_;
1028
1029 $self->{vp}->add ($self->{child} = $widget);
1030}
1031
1032sub invoke_mouse_wheel {
1033 my ($self, $ev) = @_;
1034
1035 return 0 unless $ev->{dy}; # only vertical movements
1036
1037 $self->{slider}->emit (mouse_wheel => $ev);
1038
1039 1
1040}
1041
1042sub update_slider {
1043 my ($self) = @_;
1044
1045 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1046}
1047
932sub update { 1048sub update {
933 my ($self) = @_; 1049 my ($self) = @_;
934 1050
935 $self->SUPER::update; 1051 $self->SUPER::update;
936 1052
937 # todo: overwrite size_allocate of child 1053 $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} 1054}
941 1055
942sub size_allocate { 1056sub invoke_size_allocate {
943 my ($self, $w, $h) = @_; 1057 my ($self, $w, $h) = @_;
944 1058
1059 $self->update_slider;
1060
945 $self->SUPER::size_allocate ($w, $h); 1061 $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} 1062}
950
951#TODO# update range on size_allocate depending on child
952# update viewport offset on scroll
953 1063
954############################################################################# 1064#############################################################################
955 1065
956package CFClient::UI::Frame; 1066package CFClient::UI::Frame;
957 1067
… …
973 1083
974 if ($self->{bg}) { 1084 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)}; 1085 my ($w, $h) = @$self{qw(w h)};
976 1086
977 glEnable GL_BLEND; 1087 glEnable GL_BLEND;
978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1088 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
979 glColor @{ $self->{bg} }; 1089 glColor_premultiply @{ $self->{bg} };
980 1090
981 glBegin GL_QUADS; 1091 glBegin GL_QUADS;
982 glVertex 0 , 0; 1092 glVertex 0 , 0;
983 glVertex 0 , $h; 1093 glVertex 0 , $h;
984 glVertex $w, $h; 1094 glVertex $w, $h;
… …
997 1107
998our @ISA = CFClient::UI::Bin::; 1108our @ISA = CFClient::UI::Bin::;
999 1109
1000use CFClient::OpenGL; 1110use CFClient::OpenGL;
1001 1111
1002my @tex = 1112my $bg =
1113 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1114 mipmap => 1, wrap => 1;
1115
1116my @border =
1003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1117 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); 1118 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1005 1119
1006sub new { 1120sub new {
1007 my $class = shift; 1121 my ($class, %arg) = @_;
1008 1122
1009 my $self = $class->SUPER::new ( 1123 my $self = $class->SUPER::new (
1010 bg => [1, 1, 1, 1], 1124 bg => [1, 1, 1, 1],
1011 border_bg => [1, 1, 1, 1], 1125 border_bg => [1, 1, 1, 1],
1012 border => 0.6, 1126 border => 0.6,
1013 is_toplevel => 1,
1014 can_events => 1, 1127 can_events => 1,
1015 @_ 1128 min_w => 64,
1129 min_h => 32,
1130 %arg,
1016 ); 1131 );
1017 1132
1018 $self->{title} &&= new CFClient::UI::Label 1133 $self->{title_widget} = new CFClient::UI::Label
1019 align => 0, 1134 align => 0,
1020 valign => 1, 1135 valign => 1,
1021 text => $self->{title}, 1136 text => $self->{title},
1022 fontsize => $self->{border}; 1137 fontsize => $self->{border},
1138 if exists $self->{title};
1139
1140 if ($self->{has_close_button}) {
1141 $self->{close_button} =
1142 new CFClient::UI::ImageButton
1143 path => 'x1_close.png',
1144 on_activate => sub { $self->emit ("delete") };
1145
1146 $self->CFClient::UI::Container::add ($self->{close_button});
1147 }
1023 1148
1024 $self 1149 $self
1150}
1151
1152sub add {
1153 my ($self, @widgets) = @_;
1154
1155 $self->SUPER::add (@widgets);
1156 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1025} 1158}
1026 1159
1027sub border { 1160sub border {
1028 int $_[0]{border} * $::FONTSIZE 1161 int $_[0]{border} * $::FONTSIZE
1029} 1162}
1030 1163
1031sub size_request { 1164sub size_request {
1032 my ($self) = @_; 1165 my ($self) = @_;
1166
1167 $self->{title_widget}->size_request
1168 if $self->{title_widget};
1169
1170 $self->{close_button}->size_request
1171 if $self->{close_button};
1033 1172
1034 my ($w, $h) = $self->SUPER::size_request; 1173 my ($w, $h) = $self->SUPER::size_request;
1035 1174
1036 ( 1175 (
1037 $w + $self->border * 2, 1176 $w + $self->border * 2,
1038 $h + $self->border * 2, 1177 $h + $self->border * 2,
1039 ) 1178 )
1040} 1179}
1041 1180
1042sub size_allocate { 1181sub invoke_size_allocate {
1043 my ($self, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
1044 1183
1184 if ($self->{title_widget}) {
1185 $self->{title_widget}{w} = $w;
1186 $self->{title_widget}{h} = $h;
1187 $self->{title_widget}->invoke_size_allocate ($w, $h);
1188 }
1189
1190 my $border = $self->border;
1191
1045 $h -= List::Util::max 0, $self->border * 2; 1192 $h -= List::Util::max 0, $border * 2;
1046 $w -= List::Util::max 0, $self->border * 2; 1193 $w -= List::Util::max 0, $border * 2;
1047 1194
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); 1195 $self->child->configure ($border, $border, $w, $h);
1052}
1053 1196
1197 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1198 if $self->{close_button};
1199
1200 1
1201}
1202
1203sub invoke_delete {
1204 my ($self) = @_;
1205
1206 $self->hide;
1207
1208 1
1209}
1210
1054sub button_down { 1211sub invoke_button_down {
1055 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1056 1213
1057 my ($w, $h) = @$self{qw(w h)}; 1214 my ($w, $h) = @$self{qw(w h)};
1058 my $border = $self->border; 1215 my $border = $self->border;
1059 1216
… …
1072 my ($ev, $x, $y) = @_; 1229 my ($ev, $x, $y) = @_;
1073 1230
1074 my $dx = $ev->{x} - $ox; 1231 my $dx = $ev->{x} - $ox;
1075 my $dy = $ev->{y} - $oy; 1232 my $dy = $ev->{y} - $oy;
1076 1233
1077 $self->{user_x} = $wx + $dx * $mx;
1078 $self->{user_y} = $wy + $dy * $my;
1079 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1234 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1080 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1235 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1081 $self->move ($self->{user_x}, $self->{user_y}); 1236
1082 $self->check_size; 1237 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1238 $self->realloc;
1083 }; 1239 };
1084 1240
1085 } elsif ($lr ^ $td) { 1241 } elsif ($lr ^ $td) {
1086 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1087 my ($bx, $by) = ($self->{x}, $self->{y}); 1243 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1089 $self->{motion} = sub { 1245 $self->{motion} = sub {
1090 my ($ev, $x, $y) = @_; 1246 my ($ev, $x, $y) = @_;
1091 1247
1092 ($x, $y) = ($ev->{x}, $ev->{y}); 1248 ($x, $y) = ($ev->{x}, $ev->{y});
1093 1249
1094 $self->{user_x} = $bx + $x - $ox; 1250 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1095 $self->{user_y} = $by + $y - $oy; 1251 # HACK: the next line is required to enforce placement
1096 1252 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1097 $self->move ($self->{user_x}, $self->{user_y});
1098 $self->update;
1099 }; 1253 };
1254 } else {
1255 return 0;
1256 }
1257
1100 } 1258 1
1101} 1259}
1102 1260
1103sub button_up { 1261sub invoke_button_up {
1104 my ($self, $ev, $x, $y) = @_; 1262 my ($self, $ev, $x, $y) = @_;
1105 1263
1106 delete $self->{motion}; 1264 ! ! delete $self->{motion}
1107} 1265}
1108 1266
1109sub mouse_motion { 1267sub invoke_mouse_motion {
1110 my ($self, $ev, $x, $y) = @_; 1268 my ($self, $ev, $x, $y) = @_;
1111 1269
1112 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1270 $self->{motion}->($ev, $x, $y) if $self->{motion};
1271
1272 ! ! $self->{motion}
1113} 1273}
1114 1274
1115sub _draw { 1275sub _draw {
1116 my ($self) = @_; 1276 my ($self) = @_;
1117 1277
1278 my $child = $self->{children}[0];
1279
1118 my ($w, $h ) = ($self->{w}, $self->{h}); 1280 my ($w, $h ) = ($self->{w}, $self->{h});
1119 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1281 my ($cw, $ch) = ($child->{w}, $child->{h});
1120 1282
1121 glEnable GL_TEXTURE_2D; 1283 glEnable GL_TEXTURE_2D;
1122 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1123 1285
1124 my $border = $self->border; 1286 my $border = $self->border;
1125 1287
1126 glColor @{ $self->{border_bg} }; 1288 glColor @{ $self->{border_bg} };
1127 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1289 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1128 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1290 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1129 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1291 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1130 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1292 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1131 1293
1132 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1294 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1133 my $bg = $tex[0]; 1295 glColor @{ $self->{bg} };
1134 1296
1135 # TODO: repeat texture not scale 1297 # TODO: repeat texture not scale
1298 # solve this better(?)
1136 my $rep_x = $cw / $bg->{w}; 1299 $bg->{s} = $cw / $bg->{w};
1137 my $rep_y = $ch / $bg->{h}; 1300 $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); 1301 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1145 } 1302 }
1146 1303
1147 glDisable GL_TEXTURE_2D; 1304 glDisable GL_TEXTURE_2D;
1148 1305
1149 $self->{title}->draw if $self->{title};
1150
1151 $self->child->draw; 1306 $child->draw;
1307
1308 if ($self->{title_widget}) {
1309 glTranslate 0, $border - $self->{h};
1310 $self->{title_widget}->_draw;
1311
1312 glTranslate 0, - ($border - $self->{h});
1313 }
1314
1315 $self->{close_button}->draw
1316 if $self->{close_button};
1152} 1317}
1153 1318
1154############################################################################# 1319#############################################################################
1155 1320
1156package CFClient::UI::Table; 1321package CFClient::UI::Table;
… …
1178 my ($self, $x, $y, $child) = @_; 1343 my ($self, $x, $y, $child) = @_;
1179 1344
1180 $child->set_parent ($self); 1345 $child->set_parent ($self);
1181 $self->{children}[$y][$x] = $child; 1346 $self->{children}[$y][$x] = $child;
1182 1347
1183 $self->check_size (1); 1348 $self->realloc;
1349}
1350
1351sub remove {
1352 my ($self, $child) = @_;
1353
1354 # TODO: not yet implemented
1184} 1355}
1185 1356
1186# TODO: move to container class maybe? send children a signal on removal? 1357# TODO: move to container class maybe? send children a signal on removal?
1187sub clear { 1358sub clear {
1188 my ($self) = @_; 1359 my ($self) = @_;
… …
1193 for (@children) { 1364 for (@children) {
1194 delete $_->{parent}; 1365 delete $_->{parent};
1195 $_->hide; 1366 $_->hide;
1196 } 1367 }
1197 1368
1198 $self->check_size (1); 1369 $self->realloc;
1199 $self->update;
1200} 1370}
1201 1371
1202sub get_wh { 1372sub get_wh {
1203 my ($self) = @_; 1373 my ($self) = @_;
1204 1374
… …
1230 (sum @$ws), 1400 (sum @$ws),
1231 (sum @$hs), 1401 (sum @$hs),
1232 ) 1402 )
1233} 1403}
1234 1404
1235sub size_allocate { 1405sub invoke_size_allocate {
1236 my ($self, $w, $h) = @_; 1406 my ($self, $w, $h) = @_;
1237 1407
1238 my ($ws, $hs) = $self->get_wh; 1408 my ($ws, $hs) = $self->get_wh;
1239 1409
1240 my $req_w = (sum @$ws) || 1; 1410 my $req_w = (sum @$ws) || 1;
… …
1272 } 1442 }
1273 1443
1274 $y += $row_h; 1444 $y += $row_h;
1275 } 1445 }
1276 1446
1447 1
1277} 1448}
1278 1449
1279sub find_widget { 1450sub find_widget {
1280 my ($self, $x, $y) = @_; 1451 my ($self, $x, $y) = @_;
1281 1452
… …
1318 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1489 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1319 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1490 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1320 ) 1491 )
1321} 1492}
1322 1493
1323sub size_allocate { 1494sub invoke_size_allocate {
1324 my ($self, $w, $h) = @_; 1495 my ($self, $w, $h) = @_;
1325 1496
1326 my $space = $self->{vertical} ? $h : $w; 1497 my $space = $self->{vertical} ? $h : $w;
1327 my $children = $self->{children}; 1498 my @children = $self->visible_children;
1328 1499
1329 my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1500 my @req;
1330 my $req = List::Util::sum @req;
1331 1501
1332 if ($req > $space) { 1502 if ($self->{homogeneous}) {
1333 # ah well, not enough space 1503 @req = ($space / (@children || 1)) x @children;
1334 $_ *= $space / $req for @req;
1335 } else { 1504 } else {
1505 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1506 my $req = List::Util::sum @req;
1507
1508 if ($req > $space) {
1509 # ah well, not enough space
1510 $_ *= $space / $req for @req;
1511 } else {
1336 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1512 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1337 1513
1514 $space = ($space - $req) / $expand; # remaining space to give away
1515
1338 $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand 1516 $req[$_] += $space * $children[$_]{expand}
1339 for 0 .. $#$children; 1517 for 0 .. $#children;
1518 }
1340 } 1519 }
1341 1520
1342 CFClient::UI::harmonize \@req; 1521 CFClient::UI::harmonize \@req;
1343 1522
1344 my $pos = 0; 1523 my $pos = 0;
1345 for (0 .. $#$children) { 1524 for (0 .. $#children) {
1346 my $alloc = $req[$_]; 1525 my $alloc = $req[$_];
1347 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1526 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1348 1527
1349 $pos += $alloc; 1528 $pos += $alloc;
1350 } 1529 }
1351 1530
1352 1 1531 1
… …
1404 ellipsise => 3, # end 1583 ellipsise => 3, # end
1405 layout => (new CFClient::Layout), 1584 layout => (new CFClient::Layout),
1406 fontsize => 1, 1585 fontsize => 1,
1407 align => -1, 1586 align => -1,
1408 valign => -1, 1587 valign => -1,
1409 padding => 2, 1588 padding_x => 2,
1589 padding_y => 2,
1410 can_events => 0, 1590 can_events => 0,
1411 %arg 1591 %arg
1412 ); 1592 );
1413 1593
1414 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
… …
1441 1621
1442 delete $self->{texture}; 1622 delete $self->{texture};
1443 $self->SUPER::update; 1623 $self->SUPER::update;
1444} 1624}
1445 1625
1626sub realloc {
1627 my ($self) = @_;
1628
1629 delete $self->{ox};
1630 $self->SUPER::realloc;
1631}
1632
1446sub set_text { 1633sub set_text {
1447 my ($self, $text) = @_; 1634 my ($self, $text) = @_;
1448 1635
1449 return if $self->{text} eq "T$text"; 1636 return if $self->{text} eq "T$text";
1450 $self->{text} = "T$text"; 1637 $self->{text} = "T$text";
1451 1638
1452 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1453 $self->{layout}->set_text ($text); 1639 $self->{layout}->set_text ($text);
1454 1640
1641 delete $self->{size_req};
1642 $self->realloc;
1455 $self->update; 1643 $self->update;
1456 $self->check_size;
1457} 1644}
1458 1645
1459sub set_markup { 1646sub set_markup {
1460 my ($self, $markup) = @_; 1647 my ($self, $markup) = @_;
1461 1648
1462 return if $self->{text} eq "M$markup"; 1649 return if $self->{text} eq "M$markup";
1463 $self->{text} = "M$markup"; 1650 $self->{text} = "M$markup";
1464 1651
1465 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1652 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1466 1653
1467 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1468 $self->{layout}->set_markup ($markup); 1654 $self->{layout}->set_markup ($markup);
1469 1655
1656 delete $self->{size_req};
1657 $self->realloc;
1470 $self->update; 1658 $self->update;
1471 $self->check_size;
1472} 1659}
1473 1660
1474sub size_request { 1661sub size_request {
1475 my ($self) = @_; 1662 my ($self) = @_;
1476 1663
1664 $self->{size_req} ||= do {
1477 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1665 $self->{layout}->set_font ($self->{font}) if $self->{font};
1478 $self->{layout}->set_width ($self->{max_w} || -1); 1666 $self->{layout}->set_width ($self->{max_w} || -1);
1479 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1667 $self->{layout}->set_ellipsise ($self->{ellipsise});
1480 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1668 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1481 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1669 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1482 1670
1483 my ($w, $h) = $self->{layout}->size; 1671 my ($w, $h) = $self->{layout}->size;
1484 1672
1485 if (exists $self->{template}) { 1673 if (exists $self->{template}) {
1486 $self->{template}->set_font ($self->{font}) if $self->{font}; 1674 $self->{template}->set_font ($self->{font}) if $self->{font};
1675 $self->{template}->set_width ($self->{max_w} || -1);
1487 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1676 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1488 1677
1489 my ($w2, $h2) = $self->{template}->size; 1678 my ($w2, $h2) = $self->{template}->size;
1490 1679
1491 $w = List::Util::max $w, $w2; 1680 $w = List::Util::max $w, $w2;
1492 $h = List::Util::max $h, $h2; 1681 $h = List::Util::max $h, $h2;
1682 }
1683
1684 [$w, $h]
1493 } 1685 };
1494 1686
1495 ( 1687 @{ $self->{size_req} }
1496 $w + $self->{padding} * 2,
1497 $h + $self->{padding} * 2,
1498 )
1499} 1688}
1500 1689
1690sub baseline_shift {
1691 $_[0]{layout}->descent
1692}
1693
1501sub size_allocate { 1694sub invoke_size_allocate {
1502 my ($self, $w, $h) = @_; 1695 my ($self, $w, $h) = @_;
1503 1696
1697 delete $self->{ox};
1698
1504 delete $self->{texture}; 1699 delete $self->{texture}
1700 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1701
1702 1
1505} 1703}
1506 1704
1507sub set_fontsize { 1705sub set_fontsize {
1508 my ($self, $fontsize) = @_; 1706 my ($self, $fontsize) = @_;
1509 1707
1510 $self->{fontsize} = $fontsize; 1708 $self->{fontsize} = $fontsize;
1709 delete $self->{size_req};
1511 delete $self->{texture}; 1710 delete $self->{texture};
1512 1711
1513 $self->update; 1712 $self->realloc;
1514 $self->check_size; 1713}
1714
1715sub reconfigure {
1716 my ($self) = @_;
1717
1718 delete $self->{size_req};
1719 delete $self->{texture};
1720
1721 $self->SUPER::reconfigure;
1515} 1722}
1516 1723
1517sub _draw { 1724sub _draw {
1518 my ($self) = @_; 1725 my ($self) = @_;
1519 1726
1520 $self->SUPER::_draw; # draw background, if applicable 1727 $self->SUPER::_draw; # draw background, if applicable
1521 1728
1522 my $tex = $self->{texture} ||= do { 1729 my $size = $self->{texture} ||= do {
1523 $self->{layout}->set_foreground (@{$self->{fg}}); 1730 $self->{layout}->set_foreground (@{$self->{fg}});
1524 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1731 $self->{layout}->set_font ($self->{font}) if $self->{font};
1525 $self->{layout}->set_width ($self->{w}); 1732 $self->{layout}->set_width ($self->{w});
1526 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1733 $self->{layout}->set_ellipsise ($self->{ellipsise});
1527 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1734 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1735 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529 1736
1530 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1737 [$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 }; 1738 };
1542 1739
1543 glEnable GL_TEXTURE_2D; 1740 unless (exists $self->{ox}) {
1544 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1742 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1743 : ($self->{w} - $size->[0]) * 0.5);
1545 1744
1546 if ($tex->{format} == GL_ALPHA) { 1745 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 glColor @{$self->{fg}}; 1746 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1548 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1747 : ($self->{h} - $size->[1]) * 0.5);
1549 } else {
1550 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1551 } 1748 };
1552 1749
1553 glDisable GL_TEXTURE_2D; 1750 my $w = List::Util::min $self->{w} + 4, $size->[0];
1751 my $h = List::Util::min $self->{h} + 2, $size->[1];
1752
1753 $self->{layout}->render ($self->{ox}, $self->{oy});
1554} 1754}
1555 1755
1556############################################################################# 1756#############################################################################
1557 1757
1558package CFClient::UI::EntryBase; 1758package CFClient::UI::EntryBase;
… …
1572 can_hover => 1, 1772 can_hover => 1,
1573 can_focus => 1, 1773 can_focus => 1,
1574 valign => 0, 1774 valign => 0,
1575 can_events => 1, 1775 can_events => 1,
1576 #text => ... 1776 #text => ...
1777 #hidden => "*",
1577 @_ 1778 @_
1578 ) 1779 )
1579} 1780}
1580 1781
1581sub _set_text { 1782sub _set_text {
… …
1583 1784
1584 delete $self->{cur_h}; 1785 delete $self->{cur_h};
1585 1786
1586 return if $self->{text} eq $text; 1787 return if $self->{text} eq $text;
1587 1788
1588 delete $self->{texture};
1589
1590 $self->{last_activity} = $::NOW; 1789 $self->{last_activity} = $::NOW;
1591 $self->{text} = $text; 1790 $self->{text} = $text;
1592 1791
1593 $text =~ s/./*/g if $self->{hidden}; 1792 $text =~ s/./*/g if $self->{hidden};
1594 $self->{layout}->set_text ("$text "); 1793 $self->{layout}->set_text ("$text ");
1794 delete $self->{size_req};
1595 1795
1596 $self->_emit (changed => $self->{text}); 1796 $self->emit (changed => $self->{text});
1797
1798 $self->realloc;
1799 $self->update;
1597} 1800}
1598 1801
1599sub set_text { 1802sub set_text {
1600 my ($self, $text) = @_; 1803 my ($self, $text) = @_;
1601 1804
1602 $self->{cursor} = length $text; 1805 $self->{cursor} = length $text;
1603 $self->_set_text ($text); 1806 $self->_set_text ($text);
1604 $self->update;
1605 $self->check_size;
1606} 1807}
1607 1808
1608sub get_text { 1809sub get_text {
1609 $_[0]{text} 1810 $_[0]{text}
1610} 1811}
… …
1615 my ($w, $h) = $self->SUPER::size_request; 1816 my ($w, $h) = $self->SUPER::size_request;
1616 1817
1617 ($w + 1, $h) # add 1 for cursor 1818 ($w + 1, $h) # add 1 for cursor
1618} 1819}
1619 1820
1620sub key_down { 1821sub invoke_key_down {
1621 my ($self, $ev) = @_; 1822 my ($self, $ev) = @_;
1622 1823
1623 my $mod = $ev->{mod}; 1824 my $mod = $ev->{mod};
1624 my $sym = $ev->{sym}; 1825 my $sym = $ev->{sym};
1625 my $uni = $ev->{unicode}; 1826 my $uni = $ev->{unicode};
… …
1637 } elsif ($sym == CFClient::SDLK_HOME) { 1838 } elsif ($sym == CFClient::SDLK_HOME) {
1638 $self->{cursor} = 0; 1839 $self->{cursor} = 0;
1639 } elsif ($sym == CFClient::SDLK_END) { 1840 } elsif ($sym == CFClient::SDLK_END) {
1640 $self->{cursor} = length $text; 1841 $self->{cursor} = length $text;
1641 } elsif ($uni == 27) { 1842 } elsif ($uni == 27) {
1642 $self->_emit ('escape'); 1843 $self->emit ('escape');
1643 } elsif ($uni) { 1844 } elsif ($uni) {
1644 substr $text, $self->{cursor}++, 0, chr $uni; 1845 substr $text, $self->{cursor}++, 0, chr $uni;
1846 } else {
1847 return 0;
1645 } 1848 }
1646 1849
1647 $self->_set_text ($text); 1850 $self->_set_text ($text);
1648 $self->update;
1649 $self->check_size;
1650}
1651 1851
1852 $self->realloc;
1853
1854 1
1855}
1856
1652sub focus_in { 1857sub invoke_focus_in {
1653 my ($self) = @_; 1858 my ($self) = @_;
1654 1859
1655 $self->{last_activity} = $::NOW; 1860 $self->{last_activity} = $::NOW;
1656 1861
1657 $self->SUPER::focus_in; 1862 $self->SUPER::invoke_focus_in
1658} 1863}
1659 1864
1660sub button_down { 1865sub invoke_button_down {
1661 my ($self, $ev, $x, $y) = @_; 1866 my ($self, $ev, $x, $y) = @_;
1662 1867
1663 $self->SUPER::button_down ($ev, $x, $y); 1868 $self->SUPER::invoke_button_down ($ev, $x, $y);
1664 1869
1665 my $idx = $self->{layout}->xy_to_index ($x, $y); 1870 my $idx = $self->{layout}->xy_to_index ($x, $y);
1666 1871
1667 # byte-index to char-index 1872 # byte-index to char-index
1668 my $text = $self->{text}; 1873 my $text = $self->{text};
1669 utf8::encode $text; 1874 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1670 $self->{cursor} = length substr $text, 0, $idx; 1875 $self->{cursor} = length $text;
1671 1876
1672 $self->_set_text ($self->{text}); 1877 $self->_set_text ($self->{text});
1673 $self->update; 1878 $self->update;
1879
1880 1
1674} 1881}
1675 1882
1676sub mouse_motion { 1883sub invoke_mouse_motion {
1677 my ($self, $ev, $x, $y) = @_; 1884 my ($self, $ev, $x, $y) = @_;
1678# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1885# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1886
1887 1
1679} 1888}
1680 1889
1681sub _draw { 1890sub _draw {
1682 my ($self) = @_; 1891 my ($self) = @_;
1683 1892
1684 local $self->{fg} = $self->{fg}; 1893 local $self->{fg} = $self->{fg};
1685 1894
1686 if ($FOCUS == $self) { 1895 if ($FOCUS == $self) {
1687 glColor @{$self->{active_bg}}; 1896 glColor_premultiply @{$self->{active_bg}};
1688 $self->{fg} = $self->{active_fg}; 1897 $self->{fg} = $self->{active_fg};
1689 } else { 1898 } else {
1690 glColor @{$self->{bg}}; 1899 glColor_premultiply @{$self->{bg}};
1691 } 1900 }
1692 1901
1693 glEnable GL_BLEND; 1902 glEnable GL_BLEND;
1694 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1903 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1695 glBegin GL_QUADS; 1904 glBegin GL_QUADS;
1696 glVertex 0 , 0; 1905 glVertex 0 , 0;
1697 glVertex 0 , $self->{h}; 1906 glVertex 0 , $self->{h};
1698 glVertex $self->{w}, $self->{h}; 1907 glVertex $self->{w}, $self->{h};
1699 glVertex $self->{w}, 0; 1908 glVertex $self->{w}, 0;
… …
1724 1933
1725our @ISA = CFClient::UI::EntryBase::; 1934our @ISA = CFClient::UI::EntryBase::;
1726 1935
1727use CFClient::OpenGL; 1936use CFClient::OpenGL;
1728 1937
1729sub key_down { 1938sub invoke_key_down {
1730 my ($self, $ev) = @_; 1939 my ($self, $ev) = @_;
1731 1940
1732 my $sym = $ev->{sym}; 1941 my $sym = $ev->{sym};
1733 1942
1734 if ($sym == 13) { 1943 if ($sym == 13) {
1735 unshift @{$self->{history}}, 1944 unshift @{$self->{history}},
1736 my $txt = $self->get_text; 1945 my $txt = $self->get_text;
1946
1737 $self->{history_pointer} = -1; 1947 $self->{history_pointer} = -1;
1738 $self->{history_saveback} = ''; 1948 $self->{history_saveback} = '';
1739 $self->_emit (activate => $txt); 1949 $self->emit (activate => $txt);
1740 $self->update; 1950 $self->update;
1741 1951
1742 } elsif ($sym == CFClient::SDLK_UP) { 1952 } elsif ($sym == CFClient::SDLK_UP) {
1743 if ($self->{history_pointer} < 0) { 1953 if ($self->{history_pointer} < 0) {
1744 $self->{history_saveback} = $self->get_text; 1954 $self->{history_saveback} = $self->get_text;
… …
1760 } else { 1970 } else {
1761 $self->set_text ($self->{history_saveback}); 1971 $self->set_text ($self->{history_saveback});
1762 } 1972 }
1763 1973
1764 } else { 1974 } else {
1765 $self->SUPER::key_down ($ev); 1975 return $self->SUPER::invoke_key_down ($ev)
1976 }
1977
1766 } 1978 1
1767
1768} 1979}
1769 1980
1770############################################################################# 1981#############################################################################
1771 1982
1772package CFClient::UI::Button; 1983package CFClient::UI::Button;
… …
1781 1992
1782sub new { 1993sub new {
1783 my $class = shift; 1994 my $class = shift;
1784 1995
1785 $class->SUPER::new ( 1996 $class->SUPER::new (
1786 padding => 4, 1997 padding_x => 4,
1998 padding_y => 4,
1787 fg => [1, 1, 1], 1999 fg => [1, 1, 1],
1788 active_fg => [0, 0, 1], 2000 active_fg => [0, 0, 1],
1789 can_hover => 1, 2001 can_hover => 1,
1790 align => 0, 2002 align => 0,
1791 valign => 0, 2003 valign => 0,
1792 can_events => 1, 2004 can_events => 1,
1793 @_ 2005 @_
1794 ) 2006 )
1795} 2007}
1796 2008
1797sub activate { }
1798
1799sub button_up { 2009sub invoke_button_up {
1800 my ($self, $ev, $x, $y) = @_; 2010 my ($self, $ev, $x, $y) = @_;
1801 2011
1802 $self->emit ("activate") 2012 $self->emit ("activate")
1803 if $x >= 0 && $x < $self->{w} 2013 if $x >= 0 && $x < $self->{w}
1804 && $y >= 0 && $y < $self->{h}; 2014 && $y >= 0 && $y < $self->{h};
2015
2016 1
1805} 2017}
1806 2018
1807sub _draw { 2019sub _draw {
1808 my ($self) = @_; 2020 my ($self) = @_;
1809 2021
1810 local $self->{fg} = $self->{fg}; 2022 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1811
1812 if ($GRAB == $self) {
1813 $self->{fg} = $self->{active_fg};
1814 }
1815 2023
1816 glEnable GL_TEXTURE_2D; 2024 glEnable GL_TEXTURE_2D;
1817 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1818 glColor 0, 0, 0, 1; 2026 glColor 0, 0, 0, 1;
1819 2027
… …
1824 $self->SUPER::_draw; 2032 $self->SUPER::_draw;
1825} 2033}
1826 2034
1827############################################################################# 2035#############################################################################
1828 2036
2037package CFClient::UI::ImageButton;
2038
2039our @ISA = CFClient::UI::Image::;
2040
2041use CFClient::OpenGL;
2042
2043my %textures;
2044
2045sub new {
2046 my $class = shift;
2047
2048 my $self = $class->SUPER::new (
2049 padding_x => 4,
2050 padding_y => 4,
2051 fg => [1, 1, 1],
2052 active_fg => [0, 0, 1],
2053 can_hover => 1,
2054 align => 0,
2055 valign => 0,
2056 can_events => 1,
2057 @_
2058 );
2059}
2060
2061sub invoke_button_up {
2062 my ($self, $ev, $x, $y) = @_;
2063
2064 $self->emit ("activate")
2065 if $x >= 0 && $x < $self->{w}
2066 && $y >= 0 && $y < $self->{h};
2067
2068 1
2069}
2070
2071#############################################################################
2072
1829package CFClient::UI::CheckBox; 2073package CFClient::UI::CheckBox;
1830 2074
1831our @ISA = CFClient::UI::DrawBG::; 2075our @ISA = CFClient::UI::DrawBG::;
1832 2076
1833my @tex = 2077my @tex =
… …
1838 2082
1839sub new { 2083sub new {
1840 my $class = shift; 2084 my $class = shift;
1841 2085
1842 $class->SUPER::new ( 2086 $class->SUPER::new (
1843 padding => 2, 2087 padding_x => 2,
2088 padding_y => 2,
1844 fg => [1, 1, 1], 2089 fg => [1, 1, 1],
1845 active_fg => [1, 1, 0], 2090 active_fg => [1, 1, 0],
1846 bg => [0, 0, 0, 0.2], 2091 bg => [0, 0, 0, 0.2],
1847 active_bg => [1, 1, 1, 0.5], 2092 active_bg => [1, 1, 1, 0.5],
1848 state => 0, 2093 state => 0,
… …
1852} 2097}
1853 2098
1854sub size_request { 2099sub size_request {
1855 my ($self) = @_; 2100 my ($self) = @_;
1856 2101
1857 ($self->{padding} * 2 + 6) x 2 2102 (6) x 2
1858} 2103}
1859 2104
2105sub toggle {
2106 my ($self) = @_;
2107
2108 $self->{state} = !$self->{state};
2109 $self->emit (changed => $self->{state});
2110 $self->update;
2111}
2112
1860sub button_down { 2113sub invoke_button_down {
1861 my ($self, $ev, $x, $y) = @_; 2114 my ($self, $ev, $x, $y) = @_;
1862 2115
1863 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2116 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1864 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2117 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1865 $self->{state} = !$self->{state}; 2118 $self->toggle;
1866 $self->_emit (changed => $self->{state}); 2119 } else {
2120 return 0
2121 }
2122
1867 } 2123 1
1868} 2124}
1869 2125
1870sub _draw { 2126sub _draw {
1871 my ($self) = @_; 2127 my ($self) = @_;
1872 2128
1873 $self->SUPER::_draw; 2129 $self->SUPER::_draw;
1874 2130
1875 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2131 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1876 2132
1877 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2133 my ($w, $h) = @$self{qw(w h)};
2134
2135 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1878 2136
1879 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2137 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1880 2138
1881 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2139 my $tex = $self->{state} ? $tex[1] : $tex[0];
1882 2140
… …
1890package CFClient::UI::Image; 2148package CFClient::UI::Image;
1891 2149
1892our @ISA = CFClient::UI::Base::; 2150our @ISA = CFClient::UI::Base::;
1893 2151
1894use CFClient::OpenGL; 2152use CFClient::OpenGL;
1895use Carp qw/confess/;
1896 2153
1897our %loaded_images; 2154our %texture_cache;
1898 2155
1899sub new { 2156sub new {
1900 my $class = shift; 2157 my $class = shift;
1901 2158
1902 my $self = $class->SUPER::new (can_events => 0, @_); 2159 my $self = $class->SUPER::new (
2160 can_events => 0,
2161 @_,
2162 );
1903 2163
1904 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2164 $self->{path} || $self->{tex}
2165 or Carp::croak "'path' or 'tex' attributes required";
1905 2166
1906 $loaded_images{$self->{image}} ||= 2167 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1907 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2168 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1908 2169
1909 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2170 Scalar::Util::weaken $texture_cache{$self->{path}};
1910 2171
1911 Scalar::Util::weaken $loaded_images{$self->{image}}; 2172 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1912
1913 $self->{aspect} = $tex->{w} / $tex->{h};
1914 2173
1915 $self 2174 $self
1916} 2175}
1917 2176
1918sub size_request { 2177sub size_request {
1919 my ($self) = @_; 2178 my ($self) = @_;
1920 2179
1921 ($self->{tex}->{w}, $self->{tex}->{h}) 2180 ($self->{tex}{w}, $self->{tex}{h})
1922} 2181}
1923 2182
1924sub _draw { 2183sub _draw {
1925 my ($self) = @_; 2184 my ($self) = @_;
1926 2185
… …
2035 my $ycut1 = max 0, min 1, $ycut; 2294 my $ycut1 = max 0, min 1, $ycut;
2036 my $ycut2 = max 0, min 1, $ycut - 1; 2295 my $ycut2 = max 0, min 1, $ycut - 1;
2037 2296
2038 my $h1 = $self->{h} * (1 - $ycut1); 2297 my $h1 = $self->{h} * (1 - $ycut1);
2039 my $h2 = $self->{h} * (1 - $ycut2); 2298 my $h2 = $self->{h} * (1 - $ycut2);
2299 my $h3 = $self->{h};
2300
2301 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2040 2302
2041 glEnable GL_BLEND; 2303 glEnable GL_BLEND;
2042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2304 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2305 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2043 glEnable GL_TEXTURE_2D; 2306 glEnable GL_TEXTURE_2D;
2044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2307 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2045 2308
2046 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2309 glBindTexture GL_TEXTURE_2D, $t1->{name};
2047 glBegin GL_QUADS; 2310 glBegin GL_QUADS;
… …
2062 2325
2063 if ($t3) { 2326 if ($t3) {
2064 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2327 glBindTexture GL_TEXTURE_2D, $t3->{name};
2065 glBegin GL_QUADS; 2328 glBegin GL_QUADS;
2066 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2329 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2067 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2330 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2068 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2331 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2069 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2332 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2070 glEnd; 2333 glEnd;
2071 } 2334 }
2072 2335
2073 glDisable GL_BLEND; 2336 glDisable GL_BLEND;
… …
2147 fg => [1, 1, 1], 2410 fg => [1, 1, 1],
2148 active_fg => [0, 0, 0], 2411 active_fg => [0, 0, 0],
2149 bg => [0, 0, 0, 0.2], 2412 bg => [0, 0, 0, 0.2],
2150 active_bg => [1, 1, 1, 0.5], 2413 active_bg => [1, 1, 1, 0.5],
2151 range => [0, 0, 100, 10, 0], 2414 range => [0, 0, 100, 10, 0],
2152 req_w => $::WIDTH / 80, 2415 min_w => $::WIDTH / 80,
2153 req_h => $::WIDTH / 80, 2416 min_h => $::WIDTH / 80,
2154 vertical => 0, 2417 vertical => 0,
2155 can_hover => 1, 2418 can_hover => 1,
2156 inner_pad => 0.02, 2419 inner_pad => 0.02,
2157 @_ 2420 @_
2158 ); 2421 );
… …
2166sub set_range { 2429sub set_range {
2167 my ($self, $range) = @_; 2430 my ($self, $range) = @_;
2168 2431
2169 ($range, $self->{range}) = ($self->{range}, $range); 2432 ($range, $self->{range}) = ($self->{range}, $range);
2170 2433
2171 $self->update
2172 if "@$range" ne "@{$self->{range}}"; 2434 if ("@$range" ne "@{$self->{range}}") {
2435 $self->update;
2436 $self->set_value ($self->{range}[0]);
2437 }
2173} 2438}
2174 2439
2175sub set_value { 2440sub set_value {
2176 my ($self, $value) = @_; 2441 my ($self, $value) = @_;
2177 2442
… …
2188 if $unit; 2453 if $unit;
2189 2454
2190 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2455 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2191 2456
2192 if ($value != $old_value) { 2457 if ($value != $old_value) {
2193 $self->_emit (changed => $value); 2458 $self->emit (changed => $value);
2194 $self->update; 2459 $self->update;
2195 } 2460 }
2196} 2461}
2197 2462
2198sub size_request { 2463sub size_request {
2199 my ($self) = @_; 2464 my ($self) = @_;
2200 2465
2201 my $w = $self->{req_w}; 2466 ($self->{req_w}, $self->{req_h})
2202 my $h = $self->{req_h};
2203
2204 $self->{vertical} ? ($h, $w) : ($w, $h)
2205} 2467}
2206 2468
2207sub button_down { 2469sub invoke_button_down {
2208 my ($self, $ev, $x, $y) = @_; 2470 my ($self, $ev, $x, $y) = @_;
2209 2471
2210 $self->SUPER::button_down ($ev, $x, $y); 2472 $self->SUPER::invoke_button_down ($ev, $x, $y);
2211 2473
2212 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2474 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2213 2475
2214 $self->mouse_motion ($ev, $x, $y); 2476 $self->invoke_mouse_motion ($ev, $x, $y)
2215} 2477}
2216 2478
2217sub mouse_motion { 2479sub invoke_mouse_motion {
2218 my ($self, $ev, $x, $y) = @_; 2480 my ($self, $ev, $x, $y) = @_;
2219 2481
2220 if ($GRAB == $self) { 2482 if ($GRAB == $self) {
2221 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2483 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2222 2484
2223 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2485 my (undef, $lo, $hi, $page) = @{$self->{range}};
2224 2486
2225 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2487 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2226 2488
2227 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2489 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2490 } else {
2491 return 0;
2492 }
2493
2228 } 2494 1
2495}
2496
2497sub invoke_mouse_wheel {
2498 my ($self, $ev) = @_;
2499
2500 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501
2502 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2503
2504 ! ! $delta
2229} 2505}
2230 2506
2231sub update { 2507sub update {
2232 my ($self) = @_; 2508 my ($self) = @_;
2233 2509
2234 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2510 delete $self->{knob_w};
2511 $self->SUPER::update;
2512}
2513
2514sub _draw {
2515 my ($self) = @_;
2516
2517 unless ($self->{knob_w}) {
2235 $self->set_value ($self->{range}[0]); 2518 $self->set_value ($self->{range}[0]);
2236 2519
2237 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2520 my ($value, $lo, $hi, $page) = @{$self->{range}};
2238 my $range = ($hi - $page - $lo) || 1e-100; 2521 my $range = ($hi - $page - $lo) || 1e-100;
2239 2522
… …
2245 $value = ($value - $lo) / $range; 2528 $value = ($value - $lo) / $range;
2246 $value = $value * $self->{scale} + $self->{offset}; 2529 $value = $value * $self->{scale} + $self->{offset};
2247 2530
2248 $self->{knob_x} = $value - $knob_w * 0.5; 2531 $self->{knob_x} = $value - $knob_w * 0.5;
2249 $self->{knob_w} = $knob_w; 2532 $self->{knob_w} = $knob_w;
2250 }); 2533 }
2251
2252 $self->SUPER::update;
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257 2534
2258 $self->SUPER::_draw (); 2535 $self->SUPER::_draw ();
2259 2536
2260 glScale $self->{w}, $self->{h}; 2537 glScale $self->{w}, $self->{h};
2261 2538
… …
2322sub set_range { shift->{slider}->set_range (@_) } 2599sub set_range { shift->{slider}->set_range (@_) }
2323sub set_value { shift->{slider}->set_value (@_) } 2600sub set_value { shift->{slider}->set_value (@_) }
2324 2601
2325############################################################################# 2602#############################################################################
2326 2603
2327package CFClient::UI::TextView; 2604package CFClient::UI::TextScroller;
2328 2605
2329our @ISA = CFClient::UI::HBox::; 2606our @ISA = CFClient::UI::HBox::;
2330 2607
2331use CFClient::OpenGL; 2608use CFClient::OpenGL;
2332 2609
2333sub new { 2610sub new {
2334 my $class = shift; 2611 my $class = shift;
2335 2612
2336 my $self = $class->SUPER::new ( 2613 my $self = $class->SUPER::new (
2337 fontsize => 1, 2614 fontsize => 1,
2338 can_events => 0, 2615 can_events => 1,
2616 indent => 0,
2339 #font => default_font 2617 #font => default_font
2340 @_, 2618 @_,
2341 2619
2342 layout => (new CFClient::Layout 1), 2620 layout => (new CFClient::Layout),
2343 par => [], 2621 par => [],
2344 height => 0, 2622 height => 0,
2345 children => [ 2623 children => [
2346 (new CFClient::UI::Empty expand => 1), 2624 (new CFClient::UI::Empty expand => 1),
2347 (new CFClient::UI::Slider vertical => 1), 2625 (new CFClient::UI::Slider vertical => 1),
… …
2358 2636
2359 $self->{fontsize} = $fontsize; 2637 $self->{fontsize} = $fontsize;
2360 $self->reflow; 2638 $self->reflow;
2361} 2639}
2362 2640
2641sub size_request {
2642 my ($self) = @_;
2643
2644 my ($empty, $slider) = @{ $self->{children} };
2645
2646 local $self->{children} = [$empty, $slider];
2647 $self->SUPER::size_request
2648}
2649
2363sub size_allocate { 2650sub invoke_size_allocate {
2364 my ($self, $w, $h) = @_; 2651 my ($self, $w, $h) = @_;
2365 2652
2366 $self->SUPER::size_allocate ($w, $h); 2653 my ($empty, $slider, @other) = @{ $self->{children} };
2654 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2367 2655
2368 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2656 $self->{layout}->set_font ($self->{font}) if $self->{font};
2369 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2657 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2370 $self->{layout}->set_width ($self->{children}[0]{w}); 2658 $self->{layout}->set_width ($empty->{w});
2659 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2371 2660
2372 $self->reflow; 2661 $self->reflow;
2373}
2374 2662
2375sub text_size { 2663 local $self->{children} = [$empty, $slider];
2664 $self->SUPER::invoke_size_allocate ($w, $h)
2665}
2666
2667sub invoke_mouse_wheel {
2376 my ($self, $text, $indent) = @_; 2668 my ($self, $ev) = @_;
2669
2670 return 0 unless $ev->{dy}; # only vertical movements
2671
2672 $self->{children}[1]->emit (mouse_wheel => $ev);
2673
2674 1
2675}
2676
2677sub get_layout {
2678 my ($self, $para) = @_;
2377 2679
2378 my $layout = $self->{layout}; 2680 my $layout = $self->{layout};
2379 2681
2682 $layout->set_font ($self->{font}) if $self->{font};
2683 $layout->set_foreground (@{$para->{fg}});
2380 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2684 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2381 $layout->set_width ($self->{children}[0]{w} - $indent); 2685 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2686 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2382 $layout->set_markup ($text); 2687 $layout->set_markup ($para->{markup});
2688
2689 $layout->set_shapes (
2690 map
2691 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2692 @{$para->{widget}}
2383 2693 );
2694
2384 $layout->size 2695 $layout
2385} 2696}
2386 2697
2387sub reflow { 2698sub reflow {
2388 my ($self) = @_; 2699 my ($self) = @_;
2389 2700
… …
2398 $self->{children}[1]->set_value ($offset); 2709 $self->{children}[1]->set_value ($offset);
2399} 2710}
2400 2711
2401sub clear { 2712sub clear {
2402 my ($self) = @_; 2713 my ($self) = @_;
2714
2715 my (undef, undef, @other) = @{ $self->{children} };
2716 $self->remove ($_) for @other;
2403 2717
2404 $self->{par} = []; 2718 $self->{par} = [];
2405 $self->{height} = 0; 2719 $self->{height} = 0;
2406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2720 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2407} 2721}
2408 2722
2409sub add_paragraph { 2723sub add_paragraph {
2410 my ($self, $color, $text, $indent) = @_; 2724 my ($self, $color, $para, $indent) = @_;
2411 2725
2412 for my $line (split /\n/, $text) { 2726 my ($text, @w) = ref $para ? @$para : $para;
2413 my ($w, $h) = $self->text_size ($line); 2727
2414 $self->{height} += $h; 2728 $para = {
2415 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2729 w => 1e10,
2730 wrapped => 1,
2731 fg => $color,
2732 indent => $indent,
2733 markup => $text,
2734 widget => \@w,
2416 } 2735 };
2417 2736
2418 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2737 $self->add (@w) if @w;
2738 push @{$self->{par}}, $para;
2739
2740 $self->{need_reflow}++;
2741 $self->update;
2742}
2743
2744sub scroll_to_bottom {
2745 my ($self) = @_;
2746
2747 $self->{scroll_to_bottom} = 1;
2748 $self->update;
2419} 2749}
2420 2750
2421sub update { 2751sub update {
2422 my ($self) = @_; 2752 my ($self) = @_;
2423 2753
… …
2425 2755
2426 return unless $self->{h} > 0; 2756 return unless $self->{h} > 0;
2427 2757
2428 delete $self->{texture}; 2758 delete $self->{texture};
2429 2759
2430 $ROOT->on_post_alloc ($self, sub { 2760 $ROOT->on_post_alloc ($self => sub {
2431 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2761 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2432 2762
2433 if (delete $self->{need_reflow}) { 2763 if (delete $self->{need_reflow}) {
2434 my $height = 0; 2764 my $height = 0;
2435 2765
2436 my $layout = $self->{layout};
2437
2438 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2439
2440 for (@{$self->{par}}) { 2766 for my $para (@{$self->{par}}) {
2441 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2767 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2442 $layout->set_width ($W - $_->[3]); 2768 my $layout = $self->get_layout ($para);
2443 $layout->set_markup ($_->[4]);
2444 my ($w, $h) = $layout->size; 2769 my ($w, $h) = $layout->size;
2445 $_->[0] = $w + $_->[3]; 2770
2446 $_->[1] = $h; 2771 $para->{w} = $w + $para->{indent};
2772 $para->{h} = $h;
2773 $para->{wrapped} = $layout->has_wrapped;
2447 } 2774 }
2448 2775
2449 $height += $_->[1]; 2776 $height += $para->{h};
2450 } 2777 }
2451 2778
2452 $self->{height} = $height; 2779 $self->{height} = $height;
2453 2780
2454 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2781 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2455 2782
2456 delete $self->{texture}; 2783 delete $self->{texture};
2457 } 2784 }
2458 2785
2786 if (delete $self->{scroll_to_bottom}) {
2787 $self->{children}[1]->set_value (1e10);
2788 }
2789
2459 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2790 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2460 glClearColor 0.5, 0.5, 0.5, 0; 2791 glClearColor 0, 0, 0, 0;
2461 glClear GL_COLOR_BUFFER_BIT; 2792 glClear GL_COLOR_BUFFER_BIT;
2462 2793
2463 my $top = int $self->{children}[1]{range}[0]; 2794 my $top = int $self->{children}[1]{range}[0];
2464 2795
2465 my $y0 = $top; 2796 my $y0 = $top;
2466 my $y1 = $top + $H; 2797 my $y1 = $top + $H;
2467 2798
2468 my $y = 0; 2799 my $y = 0;
2469 2800
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}}) { 2801 for my $para (@{$self->{par}}) {
2479 my $h = $par->[1]; 2802 my $h = $para->{h};
2480 2803
2481 if ($y0 < $y + $h && $y < $y1) { 2804 if ($y0 < $y + $h && $y < $y1) {
2482 $layout->set_foreground (@{ $par->[2] });
2483 $layout->set_width ($W - $par->[3]);
2484 $layout->set_markup ($par->[4]);
2485 2805
2486 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2806 my $layout = $self->get_layout ($para);
2487 2807
2488 glRasterPos $par->[3], $y - $y0; 2808 $layout->render ($para->{indent}, $y - $y0);
2489 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2809
2810 if (my @w = @{ $para->{widget} }) {
2811 my @s = $layout->get_shapes;
2812
2813 for (@w) {
2814 my ($dx, $dy) = splice @s, 0, 2, ();
2815
2816 $_->{x} = $dx + $para->{indent};
2817 $_->{y} = $dy + $y - $y0;
2818
2819 $_->draw;
2820 }
2821 }
2490 } 2822 }
2491 2823
2492 $y += $h; 2824 $y += $h;
2493 } 2825 }
2494
2495 glDisable GL_BLEND;
2496 }; 2826 };
2497 }); 2827 });
2498} 2828}
2499 2829
2830sub reconfigure {
2831 my ($self) = @_;
2832
2833 $self->SUPER::reconfigure;
2834
2835 $_->{w} = 1e10 for @{ $self->{par} };
2836 $self->reflow;
2837}
2838
2500sub _draw { 2839sub _draw {
2501 my ($self) = @_; 2840 my ($self) = @_;
2502 2841
2503 glEnable GL_TEXTURE_2D; 2842 glEnable GL_TEXTURE_2D;
2504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2843 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2505 glColor 1, 1, 1, 1; 2844 glColor 0, 0, 0, 1;
2506 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2845 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2507 glDisable GL_TEXTURE_2D; 2846 glDisable GL_TEXTURE_2D;
2508 2847
2509 $self->{children}[1]->draw; 2848 $self->{children}[1]->draw;
2510
2511} 2849}
2512 2850
2513############################################################################# 2851#############################################################################
2514 2852
2515package CFClient::UI::Animator; 2853package CFClient::UI::Animator;
… …
2594} 2932}
2595 2933
2596sub set_tooltip_from { 2934sub set_tooltip_from {
2597 my ($self, $widget) = @_; 2935 my ($self, $widget) = @_;
2598 2936
2937 my $tooltip = $widget->{tooltip};
2938
2939 if ($ENV{CFPLUS_DEBUG} & 2) {
2940 $tooltip .= "\n\n" . (ref $widget) . "\n"
2941 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2942 . "req $widget->{req_w} $widget->{req_h}\n"
2943 . "visible $widget->{visible}";
2944 }
2945
2946 $tooltip =~ s/^\n+//;
2947 $tooltip =~ s/\n+$//;
2948
2599 $self->add (new CFClient::UI::Label 2949 $self->add (new CFClient::UI::Label
2600 markup => $widget->{tooltip}, 2950 markup => $tooltip,
2601 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2951 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2602 fontsize => 0.8, 2952 fontsize => 0.8,
2603 fg => [0, 0, 0, 1], 2953 fg => [0, 0, 0, 1],
2604 ellipsise => 0, 2954 ellipsise => 0,
2605 font => ($widget->{tooltip_font} || $::FONT_PROP), 2955 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2612 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2962 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2613 2963
2614 ($w + 4, $h + 4) 2964 ($w + 4, $h + 4)
2615} 2965}
2616 2966
2617sub size_allocate { 2967sub invoke_size_allocate {
2618 my ($self, $w, $h) = @_; 2968 my ($self, $w, $h) = @_;
2619 2969
2620 $self->SUPER::size_allocate ($w - 4, $h - 4); 2970 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2971}
2972
2973sub invoke_visibility_change {
2974 my ($self, $visible) = @_;
2975
2976 return unless $visible;
2977
2978 $self->{root}->on_post_alloc ("move_$self" => sub {
2979 my $widget = $self->{owner}
2980 or return;
2981
2982 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983
2984 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985 if $x + $self->{w} > $self->{root}{w};
2986
2987 $self->move_abs ($x, $y);
2988 });
2621} 2989}
2622 2990
2623sub _draw { 2991sub _draw {
2624 my ($self) = @_; 2992 my ($self) = @_;
2625 2993
… …
2642 glVertex $w, $h; 3010 glVertex $w, $h;
2643 glVertex $w, 0; 3011 glVertex $w, 0;
2644 glEnd; 3012 glEnd;
2645 3013
2646 glTranslate 2 - 0.375, 2 - 0.375; 3014 glTranslate 2 - 0.375, 2 - 0.375;
3015
2647 $self->SUPER::_draw; 3016 $self->SUPER::_draw;
2648} 3017}
2649 3018
2650############################################################################# 3019#############################################################################
2651 3020
… …
2710 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3079 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2711 3080
2712 if ($tex) { 3081 if ($tex) {
2713 glEnable GL_TEXTURE_2D; 3082 glEnable GL_TEXTURE_2D;
2714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3083 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2715 glColor 1, 1, 1, 1; 3084 glColor 0, 0, 0, 1;
2716 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3085 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2717 glDisable GL_TEXTURE_2D; 3086 glDisable GL_TEXTURE_2D;
2718 } 3087 }
2719} 3088}
2720 3089
2721sub DESTROY { 3090sub destroy {
2722 my ($self) = @_; 3091 my ($self) = @_;
2723 3092
2724 $self->{timer}->cancel 3093 $self->{timer}->cancel
2725 if $self->{timer}; 3094 if $self->{timer};
2726 3095
2727 $self->SUPER::DESTROY; 3096 $self->SUPER::destroy;
2728} 3097}
2729 3098
2730############################################################################# 3099#############################################################################
2731 3100
2732package CFClient::UI::Inventory; 3101package CFClient::UI::Buttonbar;
2733 3102
2734our @ISA = CFClient::UI::ScrolledWindow::; 3103our @ISA = CFClient::UI::HBox::;
2735 3104
2736sub new { 3105# TODO: should actualyl 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 3106
2772############################################################################# 3107#############################################################################
2773 3108
2774package CFClient::UI::Menu; 3109package CFClient::UI::Menu;
2775 3110
… …
2787 ); 3122 );
2788 3123
2789 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3124 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2790 3125
2791 for my $item (@{ $self->{items} }) { 3126 for my $item (@{ $self->{items} }) {
2792 my ($widget, $cb) = @$item; 3127 my ($widget, $cb, $tooltip) = @$item;
2793 3128
2794 # handle various types of items, only text for now 3129 # handle various types of items, only text for now
2795 if (!ref $widget) { 3130 if (!ref $widget) {
3131 if ($widget =~ /\t/) {
3132 my ($left, $right) = split /\t/, $widget, 2;
3133
3134 $widget = new CFClient::UI::HBox
3135 can_hover => 1,
3136 can_events => 1,
3137 tooltip => $tooltip,
3138 children => [
3139 (new CFClient::UI::Label markup => $left, expand => 1),
3140 (new CFClient::UI::Label markup => $right, align => +1),
3141 ],
3142 ;
3143
3144 } else {
2796 $widget = new CFClient::UI::Label 3145 $widget = new CFClient::UI::Label
2797 can_hover => 1, 3146 can_hover => 1,
2798 can_events => 1, 3147 can_events => 1,
2799 text => $widget; 3148 markup => $widget,
3149 tooltip => $tooltip;
3150 }
2800 } 3151 }
2801 3152
2802 $self->{item}{$widget} = $item; 3153 $self->{item}{$widget} = $item;
2803 3154
2804 $self->{vbox}->add ($widget); 3155 $self->{vbox}->add ($widget);
… …
2809 3160
2810# popup given the event (must be a mouse button down event currently) 3161# popup given the event (must be a mouse button down event currently)
2811sub popup { 3162sub popup {
2812 my ($self, $ev) = @_; 3163 my ($self, $ev) = @_;
2813 3164
2814 $self->_emit ("popdown"); 3165 $self->emit ("popdown");
2815 3166
2816 # maybe save $GRAB? must be careful about events... 3167 # maybe save $GRAB? must be careful about events...
2817 $GRAB = $self; 3168 $GRAB = $self;
2818 $self->{button} = $ev->{button}; 3169 $self->{button} = $ev->{button};
2819 3170
2820 $self->show; 3171 $self->show;
2821 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3172 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2822} 3173}
2823 3174
2824sub mouse_motion { 3175sub invoke_mouse_motion {
2825 my ($self, $ev, $x, $y) = @_; 3176 my ($self, $ev, $x, $y) = @_;
2826 3177
2827 # TODO: should use vbox->find_widget or so 3178 # TODO: should use vbox->find_widget or so
2828 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3179 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2829 $self->{hover} = $self->{item}{$HOVER}; 3180 $self->{hover} = $self->{item}{$HOVER};
2830}
2831 3181
3182 0
3183}
3184
2832sub button_up { 3185sub invoke_button_up {
2833 my ($self, $ev, $x, $y) = @_; 3186 my ($self, $ev, $x, $y) = @_;
2834 3187
2835 if ($ev->{button} == $self->{button}) { 3188 if ($ev->{button} == $self->{button}) {
2836 undef $GRAB; 3189 undef $GRAB;
2837 $self->hide; 3190 $self->hide;
2838 3191
2839 $self->_emit ("popdown"); 3192 $self->emit ("popdown");
2840 $self->{hover}[1]->() if $self->{hover}; 3193 $self->{hover}[1]->() if $self->{hover};
3194 } else {
3195 return 0
3196 }
3197
2841 } 3198 1
2842} 3199}
2843 3200
2844############################################################################# 3201#############################################################################
2845 3202
2846package CFClient::UI::Statusbox; 3203package CFClient::UI::Multiplexer;
2847 3204
2848our @ISA = CFClient::UI::VBox::; 3205our @ISA = CFClient::UI::Container::;
2849 3206
2850sub new { 3207sub new {
2851 my $class = shift; 3208 my $class = shift;
2852 3209
2853 $class->SUPER::new ( 3210 my $self = $class->SUPER::new (
3211 @_,
3212 );
3213
3214 $self->{current} = $self->{children}[0]
3215 if @{ $self->{children} };
3216
3217 $self
3218}
3219
3220sub add {
3221 my ($self, @widgets) = @_;
3222
3223 $self->SUPER::add (@widgets);
3224
3225 $self->{current} = $self->{children}[0]
3226 if @{ $self->{children} };
3227}
3228
3229sub get_current_page {
3230 my ($self) = @_;
3231
3232 $self->{current}
3233}
3234
3235sub set_current_page {
3236 my ($self, $page_or_widget) = @_;
3237
3238 my $widget = ref $page_or_widget
3239 ? $page_or_widget
3240 : $self->{children}[$page_or_widget];
3241
3242 $self->{current} = $widget;
3243 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3244
3245 $self->emit (page_changed => $self->{current});
3246
3247 $self->realloc;
3248}
3249
3250sub visible_children {
3251 $_[0]{current}
3252}
3253
3254sub size_request {
3255 my ($self) = @_;
3256
3257 $self->{current}->size_request
3258}
3259
3260sub invoke_size_allocate {
3261 my ($self, $w, $h) = @_;
3262
3263 $self->{current}->configure (0, 0, $w, $h);
3264
3265 1
3266}
3267
3268sub _draw {
3269 my ($self) = @_;
3270
3271 $self->{current}->draw;
3272}
3273
3274#############################################################################
3275
3276package CFClient::UI::Notebook;
3277
3278our @ISA = CFClient::UI::VBox::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 buttonbar => (new CFClient::UI::Buttonbar),
3285 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3286 # filter => # will be put between multiplexer and $self
3287 @_,
3288 );
3289
3290 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3291 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3292
3293 $self
3294}
3295
3296sub add {
3297 my ($self, $title, $widget, $tooltip) = @_;
3298
3299 Scalar::Util::weaken $self;
3300
3301 $self->{buttonbar}->add (new CFClient::UI::Button
3302 markup => $title,
3303 tooltip => $tooltip,
3304 on_activate => sub { $self->set_current_page ($widget) },
3305 );
3306
3307 $self->{multiplexer}->add ($widget);
3308}
3309
3310sub get_current_page {
3311 my ($self) = @_;
3312
3313 $self->{multiplexer}->get_current_page
3314}
3315
3316sub set_current_page {
3317 my ($self, $page) = @_;
3318
3319 $self->{multiplexer}->set_current_page ($page);
3320 $self->emit (page_changed => $self->{multiplexer}{current});
3321}
3322
3323#############################################################################
3324
3325package CFClient::UI::Combobox;
3326
3327use utf8;
3328
3329our @ISA = CFClient::UI::Button::;
3330
3331sub new {
3332 my $class = shift;
3333
3334 my $self = $class->SUPER::new (
3335 options => [], # [value, title, longdesc], ...
3336 value => undef,
3337 @_,
3338 );
3339
3340 $self->_set_value ($self->{value});
3341
3342 $self
3343}
3344
3345sub invoke_button_down {
3346 my ($self, $ev) = @_;
3347
3348 my @menu_items;
3349
3350 for (@{ $self->{options} }) {
3351 my ($value, $title, $tooltip) = @$_;
3352
3353 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354 }
3355
3356 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357}
3358
3359sub _set_value {
3360 my ($self, $value) = @_;
3361
3362 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3363 or return;
3364
3365 $self->{value} = $item->[0];
3366 $self->set_markup ("$item->[1] ⇓");
3367 $self->set_tooltip ($item->[2]);
3368}
3369
3370sub set_value {
3371 my ($self, $value) = @_;
3372
3373 return unless $self->{value} ne $value;
3374
3375 $self->_set_value ($value);
3376 $self->emit (changed => $value);
3377}
3378
3379#############################################################################
3380
3381package CFClient::UI::Statusbox;
3382
3383our @ISA = CFClient::UI::VBox::;
3384
3385sub new {
3386 my $class = shift;
3387
3388 my $self = $class->SUPER::new (
2854 fontsize => 0.8, 3389 fontsize => 0.8,
2855 @_, 3390 @_,
2856 ) 3391 );
3392
3393 Scalar::Util::weaken (my $this = $self);
3394
3395 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396
3397 $self
2857} 3398}
2858 3399
2859sub reorder { 3400sub reorder {
2860 my ($self) = @_; 3401 my ($self) = @_;
2861 my $NOW = time; 3402 my $NOW = Time::HiRes::time;
3403
3404 # freeze display when hovering over any label
3405 return if $CFClient::UI::TOOLTIP->{owner}
3406 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3407 values %{ $self->{item} };
2862 3408
2863 while (my ($k, $v) = each %{ $self->{item} }) { 3409 while (my ($k, $v) = each %{ $self->{item} }) {
2864 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3410 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2865 } 3411 }
2866 3412
… …
2869 my @items = sort { 3415 my @items = sort {
2870 $a->{pri} <=> $b->{pri} 3416 $a->{pri} <=> $b->{pri}
2871 or $b->{id} <=> $a->{id} 3417 or $b->{id} <=> $a->{id}
2872 } values %{ $self->{item} }; 3418 } values %{ $self->{item} };
2873 3419
3420 $self->{timer}->interval (1);
3421
2874 my $count = 10 + 1; 3422 my $count = 10 + 1;
2875 for my $item (@items) { 3423 for my $item (@items) {
2876 last unless --$count; 3424 last unless --$count;
2877 3425
2878 push @widgets, $item->{label} ||= do { 3426 my $label = $item->{label} ||= do {
2879 # TODO: doesn't handle markup well (read as: at all) 3427 # TODO: doesn't handle markup well (read as: at all)
2880 my $short = $item->{count} > 1 3428 my $short = $item->{count} > 1
2881 ? "<b>$item->{count} ×</b> $item->{text}" 3429 ? "<b>$item->{count} ×</b> $item->{text}"
2882 : $item->{text}; 3430 : $item->{text};
2883 3431
… …
2891 tooltip => $item->{tooltip}, 3439 tooltip => $item->{tooltip},
2892 tooltip_font => $::FONT_PROP, 3440 tooltip_font => $::FONT_PROP,
2893 tooltip_width => 0.67, 3441 tooltip_width => 0.67,
2894 fontsize => $item->{fontsize} || $self->{fontsize}, 3442 fontsize => $item->{fontsize} || $self->{fontsize},
2895 max_w => $::WIDTH * 0.44, 3443 max_w => $::WIDTH * 0.44,
2896 fg => $item->{fg}, 3444 fg => [@{ $item->{fg} }],
2897 can_events => 1, 3445 can_events => 1,
2898 can_hover => 1 3446 can_hover => 1
2899 }; 3447 };
3448
3449 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3450 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3451 $label->update;
3452 $label->set_max_size (undef, $label->{req_h} * $diff)
3453 if $diff < 1;
3454 $self->{timer}->interval (1/30);
3455 } else {
3456 $label->{fg}[3] = $item->{fg}[3] || 1;
3457 }
3458
3459 push @widgets, $label;
2900 } 3460 }
2901 3461
2902 $self->clear; 3462 $self->clear;
2903 $self->SUPER::add (reverse @widgets); 3463 $self->SUPER::add (reverse @widgets);
2904} 3464}
… …
2909 $text =~ s/^\s+//; 3469 $text =~ s/^\s+//;
2910 $text =~ s/\s+$//; 3470 $text =~ s/\s+$//;
2911 3471
2912 return unless $text; 3472 return unless $text;
2913 3473
2914 my $timeout = time + ((delete $arg{timeout}) || 60); 3474 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2915 3475
2916 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3476 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2917 3477
2918 if (my $item = $self->{item}{$group}) { 3478 if (my $item = $self->{item}{$group}) {
2919 if ($item->{text} eq $text) { 3479 if ($item->{text} eq $text) {
2920 $item->{count}++; 3480 $item->{count}++;
2921 } else { 3481 } else {
2922 $item->{count} = 1; 3482 $item->{count} = 1;
2923 $item->{text} = $item->{tooltip} = $text; 3483 $item->{text} = $item->{tooltip} = $text;
2924 } 3484 }
2925 $item->{id} = ++$self->{id}; 3485 $item->{id} += 0.2;#d#
2926 $item->{timeout} = $timeout; 3486 $item->{timeout} = $timeout;
2927 delete $item->{label}; 3487 delete $item->{label};
2928 } else { 3488 } else {
2929 $self->{item}{$group} = { 3489 $self->{item}{$group} = {
2930 id => ++$self->{id}, 3490 id => ++$self->{id},
… …
2936 count => 1, 3496 count => 1,
2937 %arg, 3497 %arg,
2938 }; 3498 };
2939 } 3499 }
2940 3500
3501 $ROOT->on_refresh (reorder => sub {
2941 $self->reorder; 3502 $self->reorder;
3503 });
2942} 3504}
2943 3505
2944sub reconfigure { 3506sub reconfigure {
2945 my ($self) = @_; 3507 my ($self) = @_;
2946 3508
… …
2949 3511
2950 $self->reorder; 3512 $self->reorder;
2951 $self->SUPER::reconfigure; 3513 $self->SUPER::reconfigure;
2952} 3514}
2953 3515
3516sub destroy {
3517 my ($self) = @_;
3518
3519 $self->{timer}->cancel;
3520
3521 $self->SUPER::destroy;
3522}
3523
2954############################################################################# 3524#############################################################################
2955 3525
2956package CFClient::UI::Root; 3526package CFClient::UI::Inventory;
2957 3527
2958our @ISA = CFClient::UI::Container::; 3528our @ISA = CFClient::UI::Table::;
2959
2960use CFClient::OpenGL;
2961 3529
2962sub new { 3530sub new {
2963 my $class = shift; 3531 my $class = shift;
2964 3532
2965 $class->SUPER::new ( 3533 my $self = $class->SUPER::new (
3534 col_expand => [0, 1, 0],
3535 @_,
3536 );
3537
3538 $self
3539}
3540
3541sub set_items {
3542 my ($self, $items) = @_;
3543
3544 $self->clear;
3545 return unless $items;
3546
3547 my @items = sort {
3548 ($a->{type} <=> $b->{type})
3549 or ($a->{name} cmp $b->{name})
3550 } values %$items;
3551
3552 $self->{real_items} = \@items;
3553
3554 my $row = 0;
3555 for my $item (@items) {
3556 CFClient::Item::update_widgets $item;
3557
3558 $self->add (0, $row, $item->{face_widget});
3559 $self->add (1, $row, $item->{desc_widget});
3560 $self->add (2, $row, $item->{weight_widget});
3561
3562 $row++;
3563 }
3564}
3565
3566#############################################################################
3567
3568package CFClient::UI::SpellList;
3569
3570our @ISA = CFClient::UI::Table::;
3571
3572sub new {
3573 my $class = shift;
3574
3575 my $self = $class->SUPER::new (
3576 binding => [],
3577 commands => [],
3578 @_,
3579 )
3580}
3581
3582my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595sub rebuild_spell_list {
3596 my ($self) = @_;
3597
3598 $CFClient::UI::ROOT->on_refresh ($self => sub {
3599 $self->clear;
3600
3601 return unless $::CONN;
3602
3603 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609 my $row = 0;
3610
3611 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612 my $spell = $self->{spell}{$_};
3613
3614 $row++;
3615
3616 my $spell_cb = sub {
3617 my ($widget, $ev) = @_;
3618
3619 if ($ev->{button} == 1) {
3620 $::CONN->user_send ("cast $spell->{name}");
3621 } elsif ($ev->{button} == 2) {
3622 $::CONN->user_send ("invoke $spell->{name}");
3623 } elsif ($ev->{button} == 3) {
3624 (new CFClient::UI::Menu
3625 items => [
3626 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628 ],
3629 )->popup ($ev);
3630 } else {
3631 return 0;
3632 }
3633
3634 1
3635 };
3636
3637 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639 #TODO: add path info to tooltip
3640 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642 $self->add (0, $row, new CFClient::UI::Face
3643 face => $spell->{face},
3644 can_hover => 1,
3645 can_events => 1,
3646 tooltip => $tooltip,
3647 on_button_down => $spell_cb,
3648 );
3649
3650 $self->add (1, $row, new CFClient::UI::Label
3651 expand => 1,
3652 text => $spell->{name},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663 }
3664 });
3665}
3666
3667sub add_spell {
3668 my ($self, $spell) = @_;
3669
3670 $self->{spell}->{$spell->{name}} = $spell;
3671 $self->rebuild_spell_list;
3672}
3673
3674sub remove_spell {
3675 my ($self, $spell) = @_;
3676
3677 delete $self->{spell}->{$spell->{name}};
3678 $self->rebuild_spell_list;
3679}
3680
3681sub clear_spells {
3682 my ($self) = @_;
3683
3684 $self->{spell} = {};
3685 $self->rebuild_spell_list;
3686}
3687
3688#############################################################################
3689
3690package CFClient::UI::Root;
3691
3692our @ISA = CFClient::UI::Container::;
3693
3694use List::Util qw(min max);
3695
3696use CFClient::OpenGL;
3697
3698sub new {
3699 my $class = shift;
3700
3701 my $self = $class->SUPER::new (
2966 visible => 1, 3702 visible => 1,
2967 @_, 3703 @_,
2968 ) 3704 );
2969}
2970 3705
2971sub configure { 3706 Scalar::Util::weaken ($self->{root} = $self);
2972 my ($self, $x, $y, $w, $h) = @_;
2973 3707
2974 $self->{w} = $w; 3708 $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} 3709}
2984 3710
2985sub size_request { 3711sub size_request {
2986 my ($self) = @_; 3712 my ($self) = @_;
2987 3713
2988 ($self->{w}, $self->{h}) 3714 ($self->{w}, $self->{h})
2989} 3715}
2990 3716
3717sub _to_pixel {
3718 my ($coord, $size, $max) = @_;
3719
3720 $coord =
3721 $coord eq "center" ? ($max - $size) * 0.5
3722 : $coord eq "max" ? $max
3723 : $coord;
3724
3725 $coord = 0 if $coord < 0;
3726 $coord = $max - $size if $coord > $max - $size;
3727
3728 int $coord + 0.5
3729}
3730
2991sub size_allocate { 3731sub invoke_size_allocate {
2992 my ($self, $w, $h) = @_; 3732 my ($self, $w, $h) = @_;
2993 3733
2994 for my $child ($self->children) { 3734 for my $child ($self->children) {
2995 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3735 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2996 3736
2997 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3737 $X = $child->{force_x} if exists $child->{force_x};
2998 if exists $child->{req_x}; 3738 $Y = $child->{force_y} if exists $child->{force_y};
2999 3739
3000 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3740 $X = _to_pixel $X, $W, $self->{w};
3001 if exists $child->{req_y}; 3741 $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 3742
3008 $child->configure ($X, $Y, $W, $H); 3743 $child->configure ($X, $Y, $W, $H);
3009 } 3744 }
3745
3746 1
3010} 3747}
3011 3748
3012sub coord2local { 3749sub coord2local {
3013 my ($self, $x, $y) = @_; 3750 my ($self, $x, $y) = @_;
3014 3751
… …
3022} 3759}
3023 3760
3024sub update { 3761sub update {
3025 my ($self) = @_; 3762 my ($self) = @_;
3026 3763
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3764 $::WANT_REFRESH++;
3029} 3765}
3030 3766
3031sub add { 3767sub add {
3032 my ($self, @children) = @_; 3768 my ($self, @children) = @_;
3033 3769
3034 for my $child (@children) {
3035 $child->{is_toplevel} = 1; 3770 $_->{is_toplevel} = 1
3036 3771 for @children;
3037 # integerise window positions
3038 $child->{x} = int $child->{x};
3039 $child->{y} = int $child->{y};
3040 }
3041 3772
3042 $self->SUPER::add (@children); 3773 $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} 3774}
3050 3775
3051sub remove { 3776sub remove {
3052 my ($self, @children) = @_; 3777 my ($self, @children) = @_;
3053 3778
3054 $self->SUPER::remove (@children); 3779 $self->SUPER::remove (@children);
3780
3781 delete $self->{is_toplevel}
3782 for @children;
3055 3783
3056 while (@children) { 3784 while (@children) {
3057 my $w = pop @children; 3785 my $w = pop @children;
3058 push @children, $w->children; 3786 push @children, $w->children;
3059 $w->set_invisible; 3787 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3806 while ($self->{refresh_hook}) {
3079 $_->() 3807 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3808 for values %{delete $self->{refresh_hook}};
3081 } 3809 }
3082 3810
3083 if ($self->{check_size}) { 3811 if ($self->{realloc}) {
3812 my %queue;
3084 my @queue; 3813 my @queue;
3814 my $widget;
3085 3815
3086 for (;;) { 3816 outer:
3087 if ($self->{check_size}) { 3817 while () {
3088 #TODO use array-of-depth approach 3818 if (my $realloc = delete $self->{realloc}) {
3819 for $widget (values %$realloc) {
3820 $widget->{visible} or next; # do not resize invisible widgets
3089 3821
3090 @queue = sort { $a->{visible} <=> $b->{visible} } 3822 $queue{$widget+0}++ and next; # duplicates are common
3091 @queue, values %{delete $self->{check_size}}; 3823
3824 push @{ $queue[$widget->{visible}] }, $widget;
3825 }
3092 } 3826 }
3093 3827
3828 while () {
3829 @queue or last outer;
3830
3094 my $widget = pop @queue || last; 3831 $widget = pop @{ $queue[-1] || [] }
3095 3832 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 3833
3834 pop @queue;
3835 }
3836
3837 delete $queue{$widget+0};
3838
3839 my ($w, $h) = $widget->size_request;
3840
3841 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3842 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3843
3844 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3845 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3846
3847 $w = $widget->{force_w} if exists $widget->{force_w};
3848 $h = $widget->{force_h} if exists $widget->{force_h};
3849
3850 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3851 || delete $widget->{force_realloc}) {
3106 $widget->{req_w} = $w; 3852 $widget->{req_w} = $w;
3107 $widget->{req_h} = $h; 3853 $widget->{req_h} = $h;
3108 3854
3109 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3855 $self->{size_alloc}{$widget+0} = $widget;
3110 3856
3111 $widget->{parent}->check_size
3112 if $widget->{parent}; 3857 if (my $parent = $widget->{parent}) {
3858 $self->{realloc}{$parent+0} = $parent
3859 unless $queue{$parent+0};
3860
3861 $parent->{force_size_alloc} = 1;
3862 $self->{size_alloc}{$parent+0} = $parent;
3863 }
3113 } 3864 }
3865
3866 delete $self->{realloc}{$widget+0};
3114 } 3867 }
3115 } 3868 }
3116 3869
3117 while ($self->{size_alloc}) { 3870 while (my $size_alloc = delete $self->{size_alloc}) {
3118 for (values %{delete $self->{size_alloc}}) { 3871 my @queue = sort { $b->{visible} <=> $a->{visible} }
3119 my ($widget, $w, $h) = @$_; 3872 values %$size_alloc;
3873
3874 while () {
3875 my $widget = pop @queue || last;
3876
3877 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3120 3878
3121 $w = 0 if $w < 0; 3879 $w = 0 if $w < 0;
3122 $h = 0 if $h < 0; 3880 $h = 0 if $h < 0;
3123 3881
3882 $w = max $widget->{min_w}, $w;
3883 $h = max $widget->{min_h}, $h;
3884
3885 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887
3888 $w = int $w + 0.5;
3889 $h = int $h + 0.5;
3890
3891 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3892 $widget->{old_w} = $widget->{w};
3893 $widget->{old_h} = $widget->{h};
3894
3124 $widget->{w} = $w; 3895 $widget->{w} = $w;
3125 $widget->{h} = $h; 3896 $widget->{h} = $h;
3897
3126 $widget->emit (size_allocate => $w, $h); 3898 $widget->emit (size_allocate => $w, $h);
3899 }
3127 } 3900 }
3128 } 3901 }
3129 3902
3130 while ($self->{post_alloc_hook}) { 3903 while ($self->{post_alloc_hook}) {
3131 $_->() 3904 $_->()
3132 for values %{delete $self->{post_alloc_hook}}; 3905 for values %{delete $self->{post_alloc_hook}};
3133 } 3906 }
3907
3134 3908
3135 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3909 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3136 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3910 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3137 glClear GL_COLOR_BUFFER_BIT; 3911 glClear GL_COLOR_BUFFER_BIT;
3138 3912
… …
3140 glLoadIdentity; 3914 glLoadIdentity;
3141 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3915 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3142 glMatrixMode GL_MODELVIEW; 3916 glMatrixMode GL_MODELVIEW;
3143 glLoadIdentity; 3917 glLoadIdentity;
3144 3918
3919 {
3920 package CFClient::UI::Base;
3921
3922 ($draw_x, $draw_y, $draw_w, $draw_h) =
3923 (0, 0, $self->{w}, $self->{h});
3924 }
3925
3145 $self->_draw; 3926 $self->_draw;
3146} 3927}
3147 3928
3148############################################################################# 3929#############################################################################
3149 3930

Diff Legend

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