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

Diff Legend

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