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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.364 by root, Sat Dec 23 10:18:27 2006 UTC

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

Diff Legend

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