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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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