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.214 by root, Wed May 17 22:59:13 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

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

Diff Legend

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