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

Diff Legend

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