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.60 by root, Tue Apr 11 13:14:36 2006 UTC vs.
Revision 1.107 by root, Fri Apr 14 20:27:35 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
… …
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
74 80
75sub new { 81sub new {
76 my $class = shift; 82 my $class = shift;
77 83
78 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
79} 100}
80 101
81sub move { 102sub move {
82 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
83 $self->{x} = $x; 104 $self->{x} = $x;
… …
92sub size_request { 113sub size_request {
93 require Carp; 114 require Carp;
94 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
95} 116}
96 117
97sub size_allocate { 118sub _size_allocate {
98 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
99 125
100 $self->{w} = $w; 126 $self->{w} = $w;
101 $self->{h} = $h; 127 $self->{h} = $h;
102}
103 128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
104# translate global koordinates to local coordinate system 138# translate global coordinates to local coordinate system
105sub translate { 139sub translate {
106 my ($self, $x, $y) = @_; 140 my ($self, $x, $y) = @_;
107 141
108 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
109} 143}
110 144
111sub focus_in { 145sub focus_in {
112 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
149 return unless $self->{can_focus};
113 150
114 my $focus = $FOCUS; $FOCUS = $self; 151 my $focus = $FOCUS; $FOCUS = $self;
115 $focus->update if $focus; 152 $focus->update if $focus;
116 $FOCUS->update; 153 $FOCUS->update;
117} 154}
… …
125 $focus->update if $focus; #? 162 $focus->update if $focus; #?
126} 163}
127 164
128sub mouse_motion { } 165sub mouse_motion { }
129sub button_up { } 166sub button_up { }
130sub button_down { }
131sub key_down { } 167sub key_down { }
132sub key_up { } 168sub key_up { }
169
170sub button_down {
171 my ($self, $ev, $x, $y) = @_;
172
173 $self->focus_in;
174}
133 175
134sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 176sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
135sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 177sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
136sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 178sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
137sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 179sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
138sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 180sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
139 181
140sub draw { 182sub draw {
141 my ($self) = @_; 183 my ($self) = @_;
142 184
185 return unless $self->{h} && $self->{w};
186
143 glPushMatrix; 187 glPushMatrix;
144 glTranslate $self->{x}, $self->{y}, 0; 188 glTranslate $self->{x}, $self->{y}, 0;
145 $self->_draw; 189 $self->_draw;
146 if ($self == $HOVER) { 190 glPopMatrix;
147 glColor 1, 1, 1, 0.4; 191
192 if ($self == $HOVER && $self->{can_hover}) {
193 my ($x, $y) = @$self{qw(x y)};
194
195 glColor 0, 0, 1, 0.2;
148 glEnable GL_BLEND; 196 glEnable GL_BLEND;
197 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
149 glBegin GL_QUADS; 198 glBegin GL_QUADS;
150 glVertex 0 , 0; 199 glVertex $x , $y;
151 glVertex $self->{w}, 0; 200 glVertex $x + $self->{w}, $y;
152 glVertex $self->{w}, $self->{h}; 201 glVertex $x + $self->{w}, $y + $self->{h};
153 glVertex 0 , $self->{h}; 202 glVertex $x , $y + $self->{h};
154 glEnd; 203 glEnd;
155 glDisable GL_BLEND; 204 glDisable GL_BLEND;
156 } 205 }
157 glPopMatrix;
158} 206}
159 207
160sub _draw { 208sub _draw {
161 my ($self) = @_; 209 my ($self) = @_;
162 210
163 warn "no draw defined for $self\n"; 211 warn "no draw defined for $self\n";
164}
165
166sub bbox {
167 my ($self) = @_;
168 my ($w, $h) = $self->size_request;
169 (
170 $self->{x},
171 $self->{y},
172 $self->{x} = $w,
173 $self->{y} = $h
174 )
175} 212}
176 213
177sub find_widget { 214sub find_widget {
178 my ($self, $x, $y) = @_; 215 my ($self, $x, $y) = @_;
179 216
… …
182 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 219 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
183 220
184 () 221 ()
185} 222}
186 223
187sub del_parent { $_[0]->{parent} = undef }
188
189sub set_parent { 224sub set_parent {
190 my ($self, $par) = @_; 225 my ($self, $par) = @_;
191 226
192 $self->{parent} = $par; 227 $self->{parent} = $par;
193 Scalar::Util::weaken $self->{parent}; 228 Scalar::Util::weaken $self->{parent};
… …
202 237
203 $self->{parent}->update 238 $self->{parent}->update
204 if $self->{parent}; 239 if $self->{parent};
205} 240}
206 241
242sub connect {
243 my ($self, $signal, $cb) = @_;
244
245 push @{ $self->{cb}{$signal} }, $cb;
246}
247
248sub emit {
249 my ($self, $signal, @args) = @_;
250
251 $_->($self, @args)
252 for @{$self->{cb}{$signal} || []};
253}
254
207sub DESTROY { 255sub DESTROY {
208 my ($self) = @_; 256 my ($self) = @_;
209 257
210 #$self->deactivate; 258 #$self->deactivate;
211} 259}
212 260
213############################################################################# 261#############################################################################
214 262
215package CFClient::Widget::Container; 263package CFClient::UI::DrawBG;
216 264
217our @ISA = CFClient::Widget::; 265our @ISA = CFClient::UI::Base::;
266
267use strict;
268use SDL::OpenGL;
218 269
219sub new { 270sub new {
271 my $class = shift;
272
273 # range [value, low, high, page]
274
275 $class->SUPER::new (
276 bg => [0, 0, 0, 0.2],
277 active_bg => [1, 1, 1, 0.5],
278 @_
279 )
280}
281
282sub _draw {
283 my ($self) = @_;
284
285 my ($w, $h) = @$self{qw(w h)};
286
287 glEnable GL_BLEND;
288 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
289 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
290
291 glBegin GL_QUADS;
292 glVertex 0 , 0;
293 glVertex 0 , $h;
294 glVertex $w, $h;
295 glVertex $w, 0;
296 glEnd;
297
298 glDisable GL_BLEND;
299}
300
301#############################################################################
302
303package CFClient::UI::Empty;
304
305our @ISA = CFClient::UI::Base::;
306
307sub size_request {
308 (0, 0)
309}
310
311sub draw { }
312
313#############################################################################
314
315package CFClient::UI::Container;
316
317our @ISA = CFClient::UI::Base::;
318
319sub new {
220 my ($class, @widgets) = @_; 320 my ($class, %arg) = @_;
221 321
322 my $children = delete $arg{children} || [];
323
222 my $self = $class->SUPER::new (children => []); 324 my $self = $class->SUPER::new (children => [], %arg);
223 $self->add ($_) for @widgets; 325 $self->add ($_) for @$children;
224 326
225 $self 327 $self
226} 328}
227 329
228sub add { 330sub add {
229 my ($self, $chld, $expand) = @_; 331 my ($self, $chld) = @_;
230 332
231 $chld->{expand} = $expand;
232 $chld->set_parent ($self); 333 $chld->set_parent ($self);
233 334
234 @{$self->{children}} = 335 $self->{children} = [
235 sort { $a->{z} <=> $b->{z} } 336 sort { $a->{z} <=> $b->{z} }
236 @{$self->{children}}, $chld; 337 @{$self->{children}}, $chld
338 ];
237 339
238 $self->size_allocate ($self->{w}, $self->{h}) 340 $self->{w} = $self->{h} = -1;
239 if $self->{w}; #TODO: check for "realised state" 341 $self->update;
240} 342}
241 343
242sub remove { 344sub remove {
243 my ($self, $widget) = @_; 345 my ($self, $widget) = @_;
244 346
245 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
246 348
247 $self->size_allocate ($self->{w}, $self->{h}); 349 $self->size_allocate (0, 0, $self->{w}, $self->{h});
248} 350}
249 351
250sub find_widget { 352sub find_widget {
251 my ($self, $x, $y) = @_; 353 my ($self, $x, $y) = @_;
252 354
… …
269 $_->draw for @{$self->{children}}; 371 $_->draw for @{$self->{children}};
270} 372}
271 373
272############################################################################# 374#############################################################################
273 375
274package CFClient::Widget::Bin; 376package CFClient::UI::Bin;
275 377
276our @ISA = CFClient::Widget::Container::; 378our @ISA = CFClient::UI::Container::;
379
380sub new {
381 my ($class, %arg) = @_;
382
383 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
384
385 $class->SUPER::new (children => [$child], %arg)
386}
387
388sub add {
389 my ($self, $widget) = @_;
390
391 $self->{children} = [];
392
393 $self->SUPER::add ($widget);
394}
395
396sub remove {
397 my ($self, $widget) = @_;
398
399 $self->SUPER::remove ($widget);
400
401 $self->{children} = [new CFClient::UI::Empty]
402 unless @{$self->{children}};
403}
277 404
278sub child { $_[0]->{children}[0] } 405sub child { $_[0]->{children}[0] }
279 406
280sub size_request { 407sub size_request {
281 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 408 $_[0]{children}[0]->size_request
282} 409}
283 410
284sub size_allocate { 411sub size_allocate {
285 my ($self, $w, $h) = @_; 412 my ($self, $x, $y, $w, $h) = @_;
286 413
287 $self->SUPER::size_allocate ($w, $h); 414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
288 $self->{children}[0]->size_allocate ($w, $h) 416 $self->{children}[0]->size_allocate (0, 0, $w, $h);
289 if $self->{children}[0]
290} 417}
291 418
292############################################################################# 419#############################################################################
293 420
294package CFClient::Widget::Window; 421package CFClient::UI::Window;
295 422
296our @ISA = CFClient::Widget::Bin::; 423our @ISA = CFClient::UI::Bin::;
297 424
298use SDL::OpenGL; 425use SDL::OpenGL;
299 426
300sub new { 427sub new {
301 my ($class, $x, $y, $z, $w, $h) = @_; 428 my ($class, %arg) = @_;
302 429
303 my $self = $class->SUPER::new; 430 my $self = $class->SUPER::new (%arg);
304
305 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
306} 431}
307 432
308sub update { 433sub update {
309 my ($self) = @_; 434 my ($self) = @_;
310 435
436 # we want to do this delayed...
311 $self->render_chld; 437 $self->render_chld;
312 $self->SUPER::update; 438 $self->SUPER::update;
313} 439}
314 440
315sub render_chld { 441sub render_chld {
316 my ($self) = @_; 442 my ($self) = @_;
317 443
318 $self->{texture} = 444 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
319 CFClient::Texture->new_from_opengl ( 445 glClearColor 0, 0, 0, 1;
320 $self->{w}, $self->{h}, sub { $self->child->draw } 446 glClear GL_COLOR_BUFFER_BIT;
321 ); 447 $self->child->draw;
448 };
322} 449}
323 450
324sub size_allocate { 451sub size_allocate {
325 my ($self, $w, $h) = @_; 452 my ($self, $x, $y, $w, $h) = @_;
326 453
327 $self->{w} = $w; 454 $self->_size_allocate ($x, $y, $w, $h) or return;
328 $self->{h} = $h;
329 455
330 $self->child->size_allocate ($w, $h); 456 $self->child->size_allocate (0, 0, $w, $h);
331 457
332 $self->render_chld; 458 $self->render_chld;
333} 459}
334 460
335sub _draw { 461sub _draw {
… …
339 465
340 my $tex = $self->{texture} 466 my $tex = $self->{texture}
341 or return; 467 or return;
342 468
343 glEnable GL_BLEND; 469 glEnable GL_BLEND;
470 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
344 glEnable GL_TEXTURE_2D; 471 glEnable GL_TEXTURE_2D;
345 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
346 473
347 $tex->draw_quad (0, 0, $w, $h); 474 $tex->draw_quad (0, 0, $w, $h);
348 475
… …
350 glDisable GL_TEXTURE_2D; 477 glDisable GL_TEXTURE_2D;
351} 478}
352 479
353############################################################################# 480#############################################################################
354 481
355package CFClient::Widget::Frame; 482package CFClient::UI::Frame;
356 483
357our @ISA = CFClient::Widget::Bin::; 484our @ISA = CFClient::UI::Bin::;
358 485
359use SDL::OpenGL; 486use SDL::OpenGL;
360 487
361sub size_request { 488sub size_request {
362 my ($self) = @_; 489 my ($self) = @_;
… …
367 494
368 map { $_ + 4 } $chld->size_request; 495 map { $_ + 4 } $chld->size_request;
369} 496}
370 497
371sub size_allocate { 498sub size_allocate {
372 my ($self, $w, $h) = @_; 499 my ($self, $x, $y, $w, $h) = @_;
373 500
374 $self->{w} = $w; 501 $self->_size_allocate ($x, $y, $w, $h) or return;
375 $self->{h} = $h;
376 502
377 $self->child->size_allocate ($w - 4, $h - 4); 503 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
378 $self->child->move (2, 2);
379} 504}
380 505
381sub _draw { 506sub _draw {
382 my ($self) = @_; 507 my ($self) = @_;
383 508
… …
396 $chld->draw; 521 $chld->draw;
397} 522}
398 523
399############################################################################# 524#############################################################################
400 525
401package CFClient::Widget::FancyFrame; 526package CFClient::UI::FancyFrame;
402 527
403our @ISA = CFClient::Widget::Bin::; 528our @ISA = CFClient::UI::Bin::;
404 529
405use SDL::OpenGL; 530use SDL::OpenGL;
406 531
407my @tex = 532my @tex =
408 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
409 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 534 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
410 535
536sub new {
537 my $class = shift;
538
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new (
542 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8,
545 @_
546 )
547}
548
411sub size_request { 549sub size_request {
412 my ($self) = @_; 550 my ($self) = @_;
413 551
552 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
553
414 my ($w, $h) = $self->SUPER::size_request; 554 my ($w, $h) = $self->SUPER::size_request;
415 555
416 $h += $tex[1]->{height}; 556 (
417 $h += $tex[4]->{height}; 557 $w + $self->{border} * 2,
418 $w += $tex[2]->{width}; 558 $h + $self->{border} * 2,
419 $w += $tex[3]->{width}; 559 )
420
421 ($w, $h)
422} 560}
423 561
424sub size_allocate { 562sub size_allocate {
425 my ($self, $w, $h) = @_; 563 my ($self, $x, $y, $w, $h) = @_;
426 564
427 $self->SUPER::size_allocate ($w, $h); 565 $self->_size_allocate ($x, $y, $w, $h) or return;
428 566
429 $h -= $tex[1]->{height}; 567 $h -= List::Util::max 0, $self->{border} * 2;
430 $h -= $tex[4]->{height}; 568 $w -= List::Util::max 0, $self->{border} * 2;
431 $w -= $tex[2]->{width};
432 $w -= $tex[3]->{width};
433 569
434 $h = $h < 0 ? 0 : $h; 570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
435 $w = $w < 0 ? 0 : $w; 571}
436 572
437 $self->child->size_allocate ($w, $h); 573sub button_down {
438 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 574 my ($self, $ev, $x, $y) = @_;
575
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
578
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
580 my ($bw, $bh) = ($self->{w}, $self->{h});
581
582 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_;
584
585 ($x, $y) = ($ev->motion_x, $ev->motion_y);
586
587 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy;
589 $self->update;
590 };
591
592 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) {
594
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
596 my ($bx, $by) = ($self->{x}, $self->{y});
597
598 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_;
600
601 ($x, $y) = ($ev->motion_x, $ev->motion_y);
602
603 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update;
605 };
606 }
607}
608
609sub button_up {
610 my ($self, $ev, $x, $y) = @_;
611
612 delete $self->{motion};
613}
614
615sub mouse_motion {
616 my ($self, $ev, $x, $y) = @_;
617
618 $self->{motion}->($ev, $x, $y) if $self->{motion};
439} 619}
440 620
441sub _draw { 621sub _draw {
442 my ($self) = @_; 622 my ($self) = @_;
443 623
444 my ($w, $h) = ($self->{w}, $self->{h}); 624 my ($w, $h ) = ($self->{w}, $self->{h});
445 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 625 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
446 626
447 glEnable GL_BLEND; 627 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glEnable GL_TEXTURE_2D; 629 glEnable GL_TEXTURE_2D;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
451 631
452 my $top = $tex[1]; 632 glColor @{ $self->{border_bg} };
453 $top->draw_quad (0, 0, $w, $top->{height}); 633 $tex[1]->draw_quad (0, 0, $w, $self->{border});
454 634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
455 my $left = $tex[3]; 635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
456 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
457
458 my $right = $tex[2];
459 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
460
461 my $bottom = $tex[4];
462 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
463 637
464 my $bg = $tex[0]; 638 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 639
640 # TODO: repeat texture not scale
470 my $rep_x = $cw / $bg->{width}; 641 my $rep_x = $cw / $bg->{w};
471 my $rep_y = $ch / $bg->{height}; 642 my $rep_y = $ch / $bg->{h};
472 643
644 glColor @{ $self->{bg} };
645
646 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1;
473 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
474 650
651 glDisable GL_TEXTURE_2D;
475 glDisable GL_BLEND; 652 glDisable GL_BLEND;
476 glDisable GL_TEXTURE_2D;
477 653
478 $self->child->draw; 654 $self->child->draw;
479
480} 655}
481 656
482############################################################################# 657#############################################################################
483 658
484package CFClient::Widget::Table; 659package CFClient::UI::Table;
485 660
486our @ISA = CFClient::Widget::Bin::; 661our @ISA = CFClient::UI::Base::;
662
663use List::Util qw(max sum);
487 664
488use SDL::OpenGL; 665use SDL::OpenGL;
666
667sub new {
668 my $class = shift;
669
670 $class->SUPER::new (
671 col_expand => [],
672 @_
673 )
674}
489 675
490sub add { 676sub add {
491 my ($self, $x, $y, $chld) = @_; 677 my ($self, $x, $y, $chld) = @_;
492 my $old_chld = $self->{children}[$y][$x];
493 678
494 $self->{children}[$y][$x] = $chld; 679 $self->{children}[$y][$x] = $chld;
495 $chld->set_parent ($self); 680 $chld->set_parent ($self);
681
682 $self->{w} = $self->{h} = -1;
496 $self->update; 683 $self->update;
497} 684}
498 685
499sub max_row_height { 686sub get_wh {
500 my ($self, $row) = @_; 687 my ($self) = @_;
501 688
502 my $hs = 0; 689 my (@w, @h);
503 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 690
691 for my $y (0 .. $#{$self->{children}}) {
504 my $c = $self->{children}->[$row]->[$xi]; 692 my $row = $self->{children}[$y]
505 if ($c) { 693 or next;
694
695 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x]
697 or next;
506 my ($w, $h) = $c->size_request; 698 my ($w, $h) = $widget->size_request;
507 if ($hs < $h) { $hs = $h } 699
700 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h;
508 } 702 }
509 } 703 }
510 return $hs;
511}
512 704
513sub max_col_width { 705 (\@w, \@h)
706}
707
708sub size_request {
514 my ($self, $col) = @_; 709 my ($self) = @_;
515 710
711 my ($ws, $hs) = $self->get_wh;
712
713 (
714 (sum @$ws),
715 (sum @$hs),
716 )
717}
718
719sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723
724 my ($ws, $hs) = $self->get_wh;
725
726 my $req_w = sum @$ws;
727 my $req_h = sum @$hs;
728
729 # TODO: nicer code && do row_expand
730 my @col_expand = @{$self->{col_expand}};
731 @col_expand = (1) x @$ws unless @col_expand;
732 my $col_expand = (sum @col_expand) || 1;
733
734 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
737
738 $_ = int $_ for @$ws; #TODO: avoid rounding problems
739 $_ = int $_ for @$hs; #TODO: avoid rounding problems
740
741 my $y;
742
743 for my $r (0 .. $#{$self->{children}}) {
744 my $row = $self->{children}[$r]
745 or next;
746
516 my $ws = 0; 747 my $x = 0;
517 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 748 my $row_h = $hs->[$r];
518 my $c = ($self->{children}->[$yi] || [])->[$col]; 749
519 if ($c) { 750 for my $c (0 .. $#$row) {
520 my ($w, $h) = $c->size_request; 751 my $col_w = $ws->[$c];
521 if ($ws < $w) { $ws = $w } 752
753 if (my $widget = $row->[$c]) {
754 $widget->size_allocate ($x, $y, $col_w, $row_h);
755 }
756
757 $x += $col_w;
522 } 758 }
759
760 $y += $row_h;
523 } 761 }
524 return $ws; 762
525} 763}
764
765sub find_widget {
766 my ($self, $x, $y) = @_;
767
768 $x -= $self->{x};
769 $y -= $self->{y};
770
771 my $res;
772
773 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
774 $res = $_->find_widget ($x, $y)
775 and return $res;
776 }
777
778 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
779}
780
781sub _draw {
782 my ($self) = @_;
783
784 for (grep $_, @{$self->{children}}) {
785 $_->draw for grep $_, @$_;
786 }
787}
788
789#############################################################################
790
791package CFClient::UI::HBox;
792
793# TODO: wrap into common Box base class
794
795our @ISA = CFClient::UI::Container::;
526 796
527sub size_request { 797sub size_request {
528 my ($self) = @_; 798 my ($self) = @_;
529 799
800 my @alloc = map [$_->size_request], @{$self->{children}};
801
802 (
803 (List::Util::sum map $_->[0], @alloc),
804 (List::Util::max map $_->[1], @alloc),
805 )
806}
807
808sub size_allocate {
809 my ($self, $x, $y, $w, $h) = @_;
810
811 $self->_size_allocate ($x, $y, $w, $h);
812
530 my ($hs, $ws) = (0, 0); 813 ($h, $w) = ($w, $h);
531 814
532 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 815 my $children = $self->{children};
533 $hs += $self->max_row_height ($yi);
534 }
535 816
536 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 817 my @h = map +($_->size_request)[0], @$children;
537 my $wm = 0; 818
538 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 819 my $req_h = List::Util::sum @h;
539 $wm += $self->max_col_width ($xi) 820
821 if ($req_h > $h) {
822 # ah well, not enough space
823 $_ *= $h / $req_h for @h;
824 } else {
825 my $exp = List::Util::sum map $_->{expand}, @$children;
826 $exp ||= 1;
827
828 for (0 .. $#$children) {
829 my $child = $children->[$_];
830
831 my $alloc_h = $h[$_];
832 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
833 $h[$_] = $alloc_h;
540 } 834 }
541 if ($ws < $wm) { $ws = $wm }
542 } 835 }
543
544 return ($ws, $hs);
545}
546
547sub _draw {
548 my ($self) = @_;
549 836
550 my $y = 0; 837 my $y = 0;
551 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 838 for (0 .. $#$children) {
552 my $x = 0; 839 my $child = $children->[$_];
840 my $h = int $h[$_];
841 $child->size_allocate ($y, 0, $h, $w);
553 842
554 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 843 $y += $h;
555
556 my $c = $self->{children}->[$yi]->[$xi];
557 if ($c) {
558 $c->move ($x, $y, 0); #TODO: Move to size_request
559 $c->draw if $c;
560 }
561
562 $x += $self->max_col_width ($xi);
563 }
564
565 $y += $self->max_row_height ($yi);
566 } 844 }
567} 845}
568 846
569############################################################################# 847#############################################################################
570 848
571package CFClient::Widget::VBox; 849package CFClient::UI::VBox;
572 850
851# TODO: wrap into common Box base class
852
573our @ISA = CFClient::Widget::Container::; 853our @ISA = CFClient::UI::Container::;
574
575use SDL::OpenGL;
576 854
577sub size_request { 855sub size_request {
578 my ($self) = @_; 856 my ($self) = @_;
579 857
580 my @alloc = map [$_->size_request], @{$self->{children}}; 858 my @alloc = map [$_->size_request], @{$self->{children}};
… …
584 (List::Util::sum map $_->[1], @alloc), 862 (List::Util::sum map $_->[1], @alloc),
585 ) 863 )
586} 864}
587 865
588sub size_allocate { 866sub size_allocate {
589 my ($self, $w, $h) = @_; 867 my ($self, $x, $y, $w, $h) = @_;
590 868
591 $self->w ($w); 869 $self->_size_allocate ($x, $y, $w, $h);
592 $self->h ($h);
593 870
594 my $exp; 871 my $children = $self->{children};
595 my @oth; 872
596 # find expand widget 873 my @h = map +($_->size_request)[1], @$children;
597 for (@{$self->{children}}) { 874
598 if ($_->{expand}) { 875 my $req_h = List::Util::sum @h;
876
877 if ($req_h > $h) {
878 # ah well, not enough space
879 $_ *= $h / $req_h for @h;
880 } else {
881 my $exp = List::Util::sum map $_->{expand}, @$children;
599 $exp = $_; 882 $exp ||= 1;
600 last; 883
884 for (0 .. $#$children) {
885 my $child = $children->[$_];
886
887 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
601 } 888 }
602 push @oth, $_;
603 }
604
605 my ($ow, $oh);
606
607 # get sizes of other widgets
608 for (@oth) {
609 my ($w, $h) = $_->size_request;
610 $oh += $h;
611 if ($ow < $w) { $ow = $w }
612 } 889 }
613 890
614 my $y = 0; 891 my $y = 0;
615 for (@{$self->{children}}) { 892 for (0 .. $#$children) {
616 $_->move (0, $y); 893 my $child = $children->[$_];
617 894 my $h = int $h[$_];
618 if ($_ == $exp) {
619 $_->size_allocate ($w, $h - $oh);
620 $y += $h - $oh;
621 } else {
622 my ($cw, $h) = $_->size_request;
623 $_->size_allocate ($w, $h); 895 $child->size_allocate (0, $y, $w, $h);
896
624 $y += $h; 897 $y += $h;
625 }
626 } 898 }
627} 899}
628 900
629############################################################################# 901#############################################################################
630 902
631package CFClient::Widget::Label; 903package CFClient::UI::Label;
632 904
633our @ISA = CFClient::Widget::; 905our @ISA = CFClient::UI::Base::;
634 906
635use SDL::OpenGL; 907use SDL::OpenGL;
636 908
637sub new { 909sub new {
638 my ($class, $x, $y, $z, $height, $text) = @_; 910 my ($class, %arg) = @_;
639 911
640 $height ||= $::FONTSIZE;
641
642 # TODO: color, and make height, xyz etc. optional
643 my $self = $class->SUPER::new ( 912 my $self = $class->SUPER::new (
644 x => $x, 913 fg => [1, 1, 1],
645 y => $y, 914 fontsize => $::FONTSIZE,
646 z => $z, 915 text => "",
647 height => $height, 916 align => -1,
917 padding => 2,
648 layout => new CFClient::Layout, 918 layout => new CFClient::Layout,
919 %arg
649 ); 920 );
650 921
651 $self->set_text ($text); 922 $self->set_text ($self->{text});
652 923
653 $self 924 $self
925}
926
927sub escape_text {
928 local $_ = $_[1];
929
930 s/&/&amp;/g;
931 s/>/&gt;/g;
932 s/</&lt;/g;
933
934 $_[1]
654} 935}
655 936
656sub set_text { 937sub set_text {
657 my ($self, $text) = @_; 938 my ($self, $text) = @_;
658 939
659 $self->{text} = $text; 940 $self->{text} = $text;
660 $self->{layout}->set_markup ($text); 941 $self->{layout}->set_markup ($text);
661 942
662 delete $self->{texture}; 943 delete $self->{texture};
944# $self->{w} = $self->{h} = -1;
945 $self->update;
663} 946}
664 947
665sub get_text { 948sub get_text {
666 my ($self, $text) = @_; 949 my ($self, $text) = @_;
667 950
… …
670 953
671sub size_request { 954sub size_request {
672 my ($self) = @_; 955 my ($self) = @_;
673 956
674 $self->{layout}->set_width; 957 $self->{layout}->set_width;
958 $self->{layout}->set_height ($self->{fontsize});
675 $self->{layout}->size 959 my ($w, $h) = $self->{layout}->size;
676# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 960
677# ( 961 (
678# $self->{texture}{width}, 962 $w + $self->{padding} * 2,
679# $self->{texture}{height}, 963 $h + $self->{padding} * 2,
680# ) 964 )
681# } else {
682# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
683#
684# ($w, $h)
685# }
686} 965}
687 966
688sub size_allocate { 967sub size_allocate {
689 my ($self, $w, $h) = @_; 968 my ($self, $x, $y, $w, $h) = @_;
690 969
691 $self->SUPER::size_allocate ($w, $h); 970 $self->_size_allocate ($x, $y, $w, $h) or return;
971
692 delete $self->{texture}; 972 delete $self->{texture};
973}
974
975sub update {
976 my ($self) = @_;
977
978 delete $self->{texture};
979 $self->SUPER::update;
693} 980}
694 981
695sub _draw { 982sub _draw {
696 my ($self) = @_; 983 my ($self) = @_;
697 984
698 my $tex = $self->{texture} ||= do { 985 my $tex = $self->{texture} ||= do {
699 $self->{layout}->set_width ($self->{w}); 986 $self->{layout}->set_width ($self->{w});
987 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
700 new_from_layout CFClient::Texture $self->{layout}; 988 new_from_layout CFClient::Texture $self->{layout}
701 }; 989 };
990
991 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
993 glEnable GL_TEXTURE_2D;
994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
995
996 glColor @{$self->{fg}};
997
998 my $x =
999 $self->{align} < 0 ? $self->{padding}
1000 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1001 : ($self->{w} - $tex->{w}) * 0.5;
1002
1003 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
1004
1005 glDisable GL_TEXTURE_2D;
1006 glDisable GL_BLEND;
1007}
1008
1009#############################################################################
1010
1011package CFClient::UI::Entry;
1012
1013our @ISA = CFClient::UI::Label::;
1014
1015use SDL;
1016use SDL::OpenGL;
1017
1018sub new {
1019 my $class = shift;
1020
1021 $class->SUPER::new (
1022 fg => [1, 1, 1],
1023 bg => [0, 0, 0, 0.2],
1024 active_bg => [1, 1, 1, 0.5],
1025 active_fg => [0, 0, 0],
1026 can_hover => 1,
1027 can_focus => 1,
1028 @_
1029 )
1030}
1031
1032sub _set_text {
1033 my ($self, $text) = @_;
1034
1035 my $old_text = $self->{text};
1036
1037 $self->{last_activity} = $::NOW;
1038
1039 $self->{text} = $text;
1040 $self->{layout}->set_width ($self->{w});
1041 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1042
1043 $text =~ s/./*/g if $self->{hidden};
1044
1045 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1046
1047 $text = substr $text, 0, $self->{cursor};
1048 utf8::encode $text;
1049
1050 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1051
1052 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1053 if $old_text ne $self->{text};
1054}
1055
1056sub size_request {
1057 my ($self) = @_;
1058
1059 my ($w, $h) = $self->SUPER::size_request;
1060
1061 ($w + 1, $h) # add 1 for cursor
1062}
1063
1064sub size_allocate {
1065 my ($self, $x, $y, $w, $h) = @_;
1066
1067 $self->SUPER::size_allocate ($x, $y, $w, $h);
1068
1069 $self->_set_text ($self->{text});
1070}
1071
1072sub set_text {
1073 my ($self, $text) = @_;
1074
1075 $self->{cursor} = length $text;
1076 $self->_set_text ($text);
1077 $self->update;
1078}
1079
1080sub key_down {
1081 my ($self, $ev) = @_;
1082
1083 my $mod = $ev->key_mod;
1084 my $sym = $ev->key_sym;
1085
1086 my $uni = $ev->key_unicode;
1087
1088 my $text = $self->get_text;
1089
1090 if ($sym == SDLK_BACKSPACE) {
1091 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1092 } elsif ($sym == SDLK_DELETE) {
1093 substr $text, $self->{cursor}, 1, "";
1094 } elsif ($sym == SDLK_LEFT) {
1095 --$self->{cursor} if $self->{cursor};
1096 } elsif ($sym == SDLK_RIGHT) {
1097 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1098 } elsif ($sym == SDLK_HOME) {
1099 $self->{cursor} = 0;
1100 } elsif ($sym == SDLK_END) {
1101 $self->{cursor} = length $text;
1102 } elsif ($sym == SDLK_ESCAPE) {
1103 $self->emit ('escape');
1104 } elsif ($uni) {
1105 substr $text, $self->{cursor}++, 0, chr $uni;
1106 }
1107
1108 $self->_set_text ($text);
1109 $self->update;
1110}
1111
1112sub focus_in {
1113 my ($self) = @_;
1114
1115 $self->{last_activity} = $::NOW;
1116
1117 $self->SUPER::focus_in;
1118}
1119
1120sub button_down {
1121 my ($self, $ev, $x, $y) = @_;
1122
1123 $self->SUPER::button_down ($ev, $x, $y);
1124
1125 my $idx = $self->{layout}->xy_to_index ($x, $y);
1126
1127 # byte-index to char-index
1128 my $text = $self->{text};
1129 utf8::encode $text;
1130 $self->{cursor} = length substr $text, 0, $idx;
1131
1132 $self->_set_text ($self->{text});
1133 $self->update;
1134}
1135
1136sub mouse_motion {
1137 my ($self, $ev, $x, $y) = @_;
1138# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1139}
1140
1141sub _draw {
1142 my ($self) = @_;
1143
1144 local $self->{fg} = $self->{fg};
1145
1146 if ($FOCUS == $self) {
1147 glColor @{$self->{active_bg}};
1148 $self->{fg} = $self->{active_fg};
1149 } else {
1150 glColor @{$self->{bg}};
1151 }
1152
1153 glEnable GL_BLEND;
1154 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1155 glBegin GL_QUADS;
1156 glVertex 0 , 0;
1157 glVertex 0 , $self->{h};
1158 glVertex $self->{w}, $self->{h};
1159 glVertex $self->{w}, 0;
1160 glEnd;
1161 glDisable GL_BLEND;
1162
1163 $self->SUPER::_draw;
1164
1165 #TODO: force update every cursor change :(
1166 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1167 glColor @{$self->{fg}};
1168 glBegin GL_LINES;
1169 glVertex $self->{cur_x}, $self->{cur_y};
1170 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1171 glEnd;
1172 }
1173}
1174
1175package CFClient::UI::LineEntry;
1176
1177our @ISA = CFClient::UI::Entry::;
1178
1179use SDL;
1180use SDL::OpenGL;
1181
1182sub key_down {
1183 my ($self, $ev) = @_;
1184
1185 my $sym = $ev->key_sym;
1186
1187 if ($sym == SDLK_RETURN) {
1188 $self->emit (activate => $self->get_text);
1189 $self->update;
1190
1191 } else {
1192 $self->SUPER::key_down ($ev);
1193 }
1194
1195}
1196
1197#############################################################################
1198
1199package CFClient::UI::Button;
1200
1201our @ISA = CFClient::UI::Label::;
1202
1203use SDL;
1204use SDL::OpenGL;
1205
1206my @tex =
1207 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1208 qw(b1_button_active.png);
1209
1210sub new {
1211 my $class = shift;
1212
1213 $class->SUPER::new (
1214 padding => 4,
1215 fg => [1, 1, 1],
1216 bg => [1, 1, 1, 0.2],
1217 active_fg => [1, 1, 0],
1218 can_hover => 1,
1219 @_
1220 )
1221}
1222
1223sub button_up {
1224 my ($self, $ev, $x, $y) = @_;
1225
1226 if ($x >= 0 && $x < $self->{w}
1227 && $y >= 0 && $y < $self->{h}) {
1228 $self->emit ("activate");
1229 }
1230}
1231
1232sub _draw {
1233 my ($self) = @_;
1234
1235 local $self->{fg} = $self->{fg};
1236 my $tex = $tex[0];
702 1237
703 glEnable GL_BLEND; 1238 glEnable GL_BLEND;
704 glEnable GL_TEXTURE_2D; 1239 glEnable GL_TEXTURE_2D;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1240 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1241
1242 if ($GRAB == $self) {
1243 $self->{fg} = $self->{active_fg};
1244 }
1245
1246 glBindTexture GL_TEXTURE_2D, $tex->{name};
706 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1247 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
707 1248
708 glColor 1, 0, 0, 1; # TODO color 1249 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
709 1250
1251 glDisable GL_TEXTURE_2D;
1252 glDisable GL_BLEND;
1253
1254 $self->SUPER::_draw;
1255}
1256
1257#############################################################################
1258
1259package CFClient::UI::CheckBox;
1260
1261our @ISA = CFClient::UI::DrawBG::;
1262
1263my @tex =
1264 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1265 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1266
1267use SDL;
1268use SDL::OpenGL;
1269
1270sub new {
1271 my $class = shift;
1272
1273 $class->SUPER::new (
1274 padding => 2,
1275 fg => [1, 1, 1],
1276 active_fg => [1, 1, 0],
1277 state => 0,
1278 can_hover => 1,
1279 @_
1280 )
1281}
1282
1283sub size_request {
1284 my ($self) = @_;
1285
1286 ($self->{padding} * 2 + 6) x 2
1287}
1288
1289sub size_allocate {
1290 my ($self, $x, $y, $w, $h) = @_;
1291
1292 $self->_size_allocate ($x, $y, $w, $h);
1293}
1294
1295sub button_down {
1296 my ($self, $ev, $x, $y) = @_;
1297
1298 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1299 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1300 $self->{state} = !$self->{state};
1301 $self->emit (changed => $self->{state});
1302 }
1303}
1304
1305sub _draw {
1306 my ($self) = @_;
1307
1308 $self->SUPER::_draw;
1309
1310 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1311
1312 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1313
1314 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1315
1316 glEnable GL_BLEND;
1317 glEnable GL_TEXTURE_2D;
1318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1319
1320 my $tex = $self->{state} ? $tex[1] : $tex[0];
1321
710 $tex->draw_quad (0, 0); 1322 $tex->draw_quad (0, 0, $s, $s);
1323
1324 glDisable GL_TEXTURE_2D;
1325 glDisable GL_BLEND;
1326}
1327
1328#############################################################################
1329
1330package CFClient::UI::Slider;
1331
1332use strict;
1333
1334use SDL::OpenGL;
1335
1336our @ISA = CFClient::UI::DrawBG::;
1337
1338my @tex =
1339 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1340 qw(s1_slider.png s1_slider_bg.png);
1341
1342sub new {
1343 my $class = shift;
1344
1345 # range [value, low, high, page]
1346
1347 # TODO: 0-width page
1348 # TODO: req_w/h are wrong with vertical
1349 # TODO: calculations are off
1350 my $self = $class->SUPER::new (
1351 fg => [1, 1, 1],
1352 active_fg => [0, 0, 0],
1353 range => [0, 0, 100, 10],
1354 req_w => 40,
1355 req_h => 13,
1356 vertical => 0,
1357 can_hover => 1,
1358 inner_pad => 5,
1359 @_
1360 );
1361
1362 $self
1363}
1364
1365sub size_request {
1366 my ($self) = @_;
1367
1368 my $w = $self->{req_w};
1369 my $h = $self->{req_h};
1370
1371 $self->{vertical} ? ($h, $w) : ($w, $h)
1372}
1373
1374sub button_down {
1375 my ($self, $ev, $x, $y) = @_;
1376
1377 $self->SUPER::button_down ($ev, $x, $y);
1378 $self->mouse_motion ($ev, $x, $y);
1379}
1380
1381sub mouse_motion {
1382 my ($self, $ev, $x, $y) = @_;
1383
1384 if ($GRAB == $self) {
1385 my ($value, $lo, $hi, $page) = @{$self->{range}};
1386
1387 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1388
1389 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1390 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1391
1392 $x -= $inner_pad_px; # substract the padding
1393 $x = $x * ($hi - $lo) / $inner_w + $lo;
1394 $x = $lo if $x < $lo;
1395 $x = $hi - $page if $x > $hi - $page;
1396 $self->{range}[0] = $x;
1397
1398 $self->emit (changed => $x);
1399 $self->update;
1400 }
1401}
1402
1403# the inner_* stuff is for generating a padding for the slider handle,
1404# so that the handle doesn't leave the texture. This calculation isn't 100%
1405# correct propably, but it does the job for now
1406sub _calc_inner_pad_px {
1407 my ($self, $w) = @_;
1408 ($w / 100) * $self->{inner_pad} # % to pixels
1409}
1410
1411sub _draw {
1412 my ($self) = @_;
1413
1414 $self->SUPER::_draw ();
1415
1416 my ($w, $h) = @$self{qw(w h)};
1417
1418 if ($self->{vertical}) {
1419 # draw a vertical slider like a rotated horizontal slider
1420
1421 glRotate 90, 0, 0, 1;
1422 glTranslate 0, -$self->{w}, 0;
1423
1424 ($w, $h) = ($h, $w);
1425 }
1426
1427 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1428 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1429
1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1431
1432 $hi = $value + 1 if $lo == $hi;
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $page = int $page * $inner_w / ($hi - $lo);
1438 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1439
1440 $w -= $page;
1441 $page &= ~1;
1442 glTranslate $page * 0.5, 0, 0;
1443 $page ||= 2;
1444
1445 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1446 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1447
1448 glEnable GL_BLEND;
1449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1450 glEnable GL_TEXTURE_2D;
1451 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1452
1453 # draw background
1454 $tex[1]->draw_quad (0, 0, $w, $h);
1455
1456 # draw handle
1457 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
711 1458
712 glDisable GL_BLEND; 1459 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 1460 glDisable GL_TEXTURE_2D;
714} 1461}
715 1462
716############################################################################# 1463#############################################################################
717 1464
1465package CFClient::UI::TextView;
1466
1467our @ISA = CFClient::UI::HBox::;
1468
1469use SDL::OpenGL;
1470
1471sub new {
1472 my $class = shift;
1473
1474 my $self = $class->SUPER::new (
1475 req_w => $::WIDTH / 6,
1476 req_h => $::HEIGHT / 6,
1477 fontsize => $::FONTSIZE,
1478 @_,
1479
1480 layout => (new CFClient::Layout),
1481 par => [],
1482 height => 0,
1483 children => [
1484 (new CFClient::UI::Empty expand => 1),
1485 (new CFClient::UI::Slider vertical => 1),
1486 ],
1487 );
1488
1489 $self->{children}[1]->connect (changed => sub {
1490 $self->update;
1491 });
1492
1493 $self
1494}
1495
1496sub set_fontsize {
1497 my ($self, $fontsize) = @_;
1498
1499 $self->{fontsize} = $fontsize;
1500 $self->reflow;
1501}
1502
1503sub text_height {
1504 my ($self, $text) = @_;
1505
1506 my $layout = $self->{layout};
1507
1508 $layout->set_height ($self->{fontsize});
1509 $layout->set_width ($self->{w});
1510 $layout->set_text ($text);
1511
1512 ($layout->size)[1]
1513}
1514
1515sub reflow {
1516 my ($self) = @_;
1517
1518 $self->{need_reflow}++;
1519 $self->update;
1520}
1521
1522sub size_request {
1523 my ($self) = @_;
1524
1525 ($self->{req_w}, $self->{req_h})
1526}
1527
1528sub size_allocate {
1529 my ($self, $x, $y, $w, $h) = @_;
1530
1531 $self->SUPER::size_allocate ($x, $y, $w, $h);
1532
1533 $self->{layout}->set_height ($self->{fontsize});
1534 $self->{layout}->set_width ($self->{w});
1535
1536 $self->reflow;
1537}
1538
1539sub add_paragraph {
1540 my ($self, $color, $text) = @_;
1541
1542 #TODO: intelligently "reformat" paragraph
1543
1544 my $height = $self->text_height ($text);
1545
1546 $self->{height} += $height;
1547
1548 push @{$self->{par}}, [$height, $color, $text];
1549
1550 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1551 $self->{children}[1]->update;
1552}
1553
1554sub update {
1555 my ($self) = @_;
1556
1557 $self->SUPER::update;
1558
1559 return unless $self->{h} > 0;
1560
1561 delete $self->{texture};
1562
1563 $TOPLEVEL->on_refresh ($self, sub {
1564 if (delete $self->{need_reflow}) {
1565 my $height = 0;
1566
1567 $height += $_->[0] = $self->text_height ($_->[2])
1568 for @{$self->{par}};
1569
1570 $self->{height} = $height;
1571
1572 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1573
1574 delete $self->{texture};
1575 }
1576
1577 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1578 glClearColor 0, 0, 0, 1;
1579 glClear GL_COLOR_BUFFER_BIT;
1580
1581 glEnable GL_BLEND;
1582 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1583 glEnable GL_TEXTURE_2D;
1584 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1585
1586 my $top = int $self->{children}[1]{range}[0];
1587
1588 my $y0 = $top;
1589 my $y1 = $top + $self->{h};
1590
1591 my $y = 0;
1592
1593 my $layout = $self->{layout};
1594
1595 for my $par (@{$self->{par}}) {
1596 my $h = $par->[0];
1597
1598 if ($y0 < $y + $h && $y < $y1) {
1599 $layout->set_text ($par->[2]);
1600
1601 glColor @{ $par->[1] };
1602 my ($W, $H) = $layout->size;
1603 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1604 }
1605
1606 $y += $h;
1607 }
1608
1609 glDisable GL_TEXTURE_2D;
1610 glDisable GL_BLEND;
1611 };
1612 });
1613}
1614
1615sub _draw {
1616 my ($self) = @_;
1617
1618 if ($self->{texture}) {
1619 glEnable GL_TEXTURE_2D;
1620 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1621 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1622 glDisable GL_TEXTURE_2D;
1623 }
1624
1625 $self->{children}[1]->draw;
1626
1627}
1628
1629#############################################################################
1630
718package CFClient::Widget::Entry; 1631package CFClient::UI::MapWidget;
719 1632
720our @ISA = CFClient::Widget::Label::; 1633use strict;
1634
1635use List::Util qw(min max);
721 1636
722use SDL; 1637use SDL;
723use SDL::OpenGL; 1638use SDL::OpenGL;
724 1639
725sub key_down {
726 my ($self, $ev) = @_;
727
728 my $mod = $ev->key_mod;
729 my $sym = $ev->key_sym;
730
731 my $uni = $ev->key_unicode;
732
733 my $text = $self->get_text;
734
735 if ($sym == SDLK_BACKSPACE) {
736 substr $text, -1, 1, '';
737 } elsif ($uni) {
738 $text .= chr $uni;
739 }
740
741 $self->set_text ($text);
742}
743
744sub button_down {
745 my ($self, $ev) = @_;
746
747 $self->focus_in;
748}
749
750sub mouse_motion {
751 my ($self, $ev, $x, $y) = @_;
752 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
753}
754
755sub _draw {
756 my ($self) = @_;
757
758 if ($FOCUS == $self) {
759 glColor 1, 1, 1;
760 } else {
761 glColor 0.7, 0.7, 0.7;
762 }
763
764 glBegin GL_QUADS;
765 glVertex 0 , 0;
766 glVertex 0 , $self->{h} - 1;
767 glVertex $self->{w} - 1, $self->{h} - 1;
768 glVertex $self->{w} - 1, 0;
769 glEnd;
770
771 $self->SUPER::_draw;
772}
773
774#############################################################################
775
776package CFClient::Widget::MapWidget;
777
778use strict;
779
780use List::Util qw(min max);
781
782use SDL;
783use SDL::OpenGL;
784use SDL::OpenGL::Constants;
785
786our @ISA = CFClient::Widget::; 1640our @ISA = CFClient::UI::Base::;
1641
1642sub new {
1643 my $class = shift;
1644
1645 $class->SUPER::new (
1646 z => -1,
1647 can_focus => 1,
1648 list => (glGenLists 1),
1649 @_
1650 )
1651}
787 1652
788sub key_down { 1653sub key_down {
789 print "MAPKEYDOWN\n"; 1654 print "MAPKEYDOWN\n";
790} 1655}
791 1656
792sub key_up { 1657sub key_up {
793} 1658}
794 1659
795sub size_request { 1660sub size_request {
796 ( 1661 (
797 1 + int $::WIDTH / 32, 1662 1 + 32 * int $::WIDTH / 32,
798 1 + int $::HEIGHT / 32, 1663 1 + 32 * int $::HEIGHT / 32,
799 ) 1664 )
800} 1665}
801 1666
1667sub update {
1668 my ($self) = @_;
1669
1670 $self->{need_update} = 1;
1671 $self->SUPER::update;
1672}
1673
802sub _draw { 1674sub draw {
803 my ($self) = @_; 1675 my ($self) = @_;
804 1676
805 my $mx = $::CONN->{mapx}; 1677 $self->{need_update}++;#d#
806 my $my = $::CONN->{mapy}; 1678 if (delete $self->{need_update}) {
1679 glNewList $self->{list}, GL_COMPILE;
807 1680
808 my $map = $::CONN->{map};
809
810 my ($xofs, $yofs);
811
812 my $sw = 1 + int $::WIDTH / 32; 1681 my $sw = int $::WIDTH / 32;
813 my $sh = 1 + int $::HEIGHT / 32; 1682 my $sh = int $::HEIGHT / 32;
814 1683
815 if ($::CONN->{mapw} > $sw) { 1684 if ($::MAP) {
816 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1685 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
817 } else {
818 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
819 }
820 1686
821 if ($::CONN->{maph} > $sh) { 1687 if ($::CFG->{fow_enable}) {
822 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1688 if ($::CFG->{fow_smooth}) { # smooth fog of war
823 } else { 1689 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
824 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1690 glConvolutionFilter2D
825 } 1691 GL_CONVOLUTION_2D,
826 1692 GL_ALPHA,
827 glEnable GL_TEXTURE_2D; 1693 3, 3,
828 glEnable GL_BLEND; 1694 GL_ALPHA, GL_FLOAT,
829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1695 pack "f*",
830 1696 0.1, 0.1, 0.1,
831 my $sw4 = ($sw + 3) & ~3; 1697 0.1, 0.2, 0.1,
832 my $darkness = "\x00" x ($sw4 * $sh); 1698 0.1, 0.1, 0.1,
833 1699 ;
834 for my $x (0 .. $sw - 1) { 1700 glEnable GL_CONVOLUTION_2D;
835 my $row = $map->[$x + $xofs];
836 for my $y (0 .. $sh - 1) {
837
838 my $cell = $row->[$y + $yofs]
839 or next;
840
841 my $dark = $cell->[0];
842 if ($dark < 0) {
843 substr $darkness, $y * $sw4 + $x, 1, chr 224;
844 } else {
845 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
846 }
847
848 for my $num (grep $_, @$cell[1,2,3]) {
849 my $tex = $::CONN->{face}[$num]{texture} || next;
850 1701 }
851 my $w = $tex->{width};
852 my $h = $tex->{height};
853 1702
854 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h); 1703 my $tex = new CFClient::Texture
1704 w => $w,
1705 h => $h,
1706 data => $data,
1707 internalformat => GL_ALPHA,
1708 format => GL_ALPHA;
1709
1710 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1711
1712 glEnable GL_BLEND;
1713 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1715
1716 glColor +($::CFG->{fow_intensity}) x 3, 1;
1717 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1718
1719 glDisable GL_TEXTURE_2D;
1720 glDisable GL_BLEND;
855 } 1721 }
856 } 1722 }
857 }
858 1723
859# if (1) { # higher quality darkness 1724 glEndList;
860# $lighting =~ s/(.)/$1$1$1/gs;
861# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
862#
863# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
864#
865# $lighting = $pb->get_pixels;
866# $lighting =~ s/(.)../$1/gs;
867# } 1725 }
868 1726
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1727 glCallList $self->{list};
870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
871 1728
872 $darkness = new CFClient::Texture 1729 if ($FOCUS != $self) {
873 width => $sw4, 1730 glColor 64/255, 64/255, 64/255;
874 height => $sh, 1731 glLogicOp GL_AND;
875 data => $darkness, 1732 glEnable GL_COLOR_LOGIC_OP;
876 internalformat => GL_ALPHA, 1733 glBegin GL_QUADS;
877 format => GL_ALPHA; 1734 glVertex 0, 0;
878 1735 glVertex 0, $::HEIGHT;
879 glColor 0.45, 0.45, 0.45, 1; 1736 glVertex $::WIDTH, $::HEIGHT;
880 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1737 glVertex $::WIDTH, 0;
881 1738 glEnd;
882 glDisable GL_TEXTURE_2D; 1739 glDisable GL_COLOR_LOGIC_OP;
883 glDisable GL_BLEND; 1740 }
884} 1741}
885 1742
886my %DIR = ( 1743my %DIR = (
887 SDLK_KP8, [1, "north"], 1744 SDLK_KP8, [1, "north"],
888 SDLK_KP9, [2, "northeast"], 1745 SDLK_KP9, [2, "northeast"],
… …
904 1761
905 my $mod = $ev->key_mod; 1762 my $mod = $ev->key_mod;
906 my $sym = $ev->key_sym; 1763 my $sym = $ev->key_sym;
907 1764
908 if ($sym == SDLK_KP5) { 1765 if ($sym == SDLK_KP5) {
909 $::CONN->send ("command stay fire"); 1766 $::CONN->user_send ("command stay fire");
1767 } elsif ($sym == SDLK_a) {
1768 $::CONN->user_send ("command apply");
1769 } elsif ($sym == SDLK_QUOTE) {
1770 $self->emit ('activate_console');
1771 } elsif ($sym == SDLK_SLASH) {
1772 $self->emit ('activate_console' => '/');
910 } elsif (exists $DIR{$sym}) { 1773 } elsif (exists $DIR{$sym}) {
911 if ($mod & KMOD_SHIFT) { 1774 if ($mod & KMOD_SHIFT) {
912 $self->{shft}++; 1775 $self->{shft}++;
913 $::CONN->send ("command fire $DIR{$sym}[0]"); 1776 $::CONN->user_send ("command fire $DIR{$sym}[0]");
914 } elsif ($mod & KMOD_CTRL) { 1777 } elsif ($mod & KMOD_CTRL) {
915 $self->{ctrl}++; 1778 $self->{ctrl}++;
916 $::CONN->send ("command run $DIR{$sym}[0]"); 1779 $::CONN->user_send ("command run $DIR{$sym}[0]");
917 } else { 1780 } else {
918 $::CONN->send ("command $DIR{$sym}[1]"); 1781 $::CONN->user_send ("command $DIR{$sym}[1]");
919 } 1782 }
920 } 1783 }
921} 1784}
922 1785
923sub key_up { 1786sub key_up {
… …
925 1788
926 my $mod = $ev->key_mod; 1789 my $mod = $ev->key_mod;
927 my $sym = $ev->key_sym; 1790 my $sym = $ev->key_sym;
928 1791
929 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1792 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
930 $::CONN->send ("command fire_stop"); 1793 $::CONN->user_send ("command fire_stop");
931 } 1794 }
932 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1795 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
933 $::CONN->send ("command run_stop"); 1796 $::CONN->user_send ("command run_stop");
934 } 1797 }
935} 1798}
936 1799
937############################################################################# 1800#############################################################################
938 1801
939package CFClient::Widget::Animator; 1802package CFClient::UI::Animator;
940 1803
941use SDL::OpenGL; 1804use SDL::OpenGL;
942 1805
943our @ISA = CFClient::Widget::Bin::; 1806our @ISA = CFClient::UI::Bin::;
944 1807
945sub moveto { 1808sub moveto {
946 my ($self, $x, $y) = @_; 1809 my ($self, $x, $y) = @_;
947 1810
948 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1811 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
976 glPopMatrix; 1839 glPopMatrix;
977} 1840}
978 1841
979############################################################################# 1842#############################################################################
980 1843
1844package CFClient::UI::Flopper;
1845
1846our @ISA = CFClient::UI::Button::;
1847
1848sub new {
1849 my $class = shift;
1850
1851 my $self = $class->SUPER::new (
1852 state => 0,
1853 connect_activate => \&toggle_flopper,
1854 @_
1855 );
1856
1857 if ($self->{state}) {
1858 $self->{state} = 0;
1859 $self->toggle_flopper;
1860 }
1861
1862 $self
1863}
1864
1865sub toggle_flopper {
1866 my ($self) = @_;
1867
1868 # TODO: use animation
1869 if ($self->{state} = !$self->{state}) {
1870 $CFClient::UI::TOPLEVEL->add ($self->{other});
1871 $self->{other}->move (
1872 ($::WIDTH - $self->{other}{w}) * 0.5,
1873 ($::HEIGHT - $self->{other}{h}) * 0.5,
1874 );
1875 } else {
1876 $CFClient::UI::TOPLEVEL->remove ($self->{other});
1877 }
1878}
1879
1880#############################################################################
1881
981package CFClient::Widget::Toplevel; 1882package CFClient::UI::Toplevel;
982 1883
983our @ISA = CFClient::Widget::Container::; 1884our @ISA = CFClient::UI::Container::;
1885
1886use SDL::OpenGL;
984 1887
985sub size_request { 1888sub size_request {
986 ($::WIDTH, $::HEIGHT) 1889 ($::WIDTH, $::HEIGHT)
987} 1890}
988 1891
989sub size_allocate { 1892sub size_allocate {
990 my ($self, $w, $h) = @_; 1893 my ($self, $x, $y, $w, $h) = @_;
991 1894
992 $self->SUPER::size_allocate ($w, $h); 1895 $self->_size_allocate ($x, $y, $w, $h);
993 1896
994 $_->size_allocate ($_->size_request) 1897 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
995 for @{$self->{children}}; 1898 for @{$self->{children}};
996} 1899}
997 1900
998sub translate { 1901sub translate {
999 my ($self, $x, $y) = @_; 1902 my ($self, $x, $y) = @_;
… …
1002} 1905}
1003 1906
1004sub update { 1907sub update {
1005 my ($self) = @_; 1908 my ($self) = @_;
1006 1909
1007 $self->size_allocate ($self->size_request); 1910 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1008 ::refresh (); 1911 ::refresh ();
1009} 1912}
1010 1913
1011sub add { 1914sub add {
1012 my ($self, $widget) = @_; 1915 my ($self, $widget) = @_;
1013 1916
1014 $self->SUPER::add ($widget); 1917 $self->SUPER::add ($widget);
1015 1918
1016 $widget->size_allocate ($widget->size_request); 1919 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
1920}
1921
1922sub on_refresh {
1923 my ($self, $id, $cb) = @_;
1924
1925 $self->{refresh_hook}{$id} = $cb;
1017} 1926}
1018 1927
1019sub draw { 1928sub draw {
1020 my ($self) = @_; 1929 my ($self) = @_;
1021 1930
1931 while (my $rcb = delete $self->{refresh_hook}) {
1932 $_->() for values %$rcb;
1933 }
1934
1935 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1936 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1937 glClear GL_COLOR_BUFFER_BIT;
1938
1939 glMatrixMode GL_PROJECTION;
1940 glLoadIdentity;
1941 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
1942 glMatrixMode GL_MODELVIEW;
1943 glLoadIdentity;
1944
1022 $self->_draw; 1945 $self->_draw;
1023} 1946}
1024 1947
1025############################################################################# 1948#############################################################################
1026 1949
1027package CFClient::Widget; 1950package CFClient::UI;
1028 1951
1029$TOPLEVEL = new CFClient::Widget::Toplevel; 1952$TOPLEVEL = new CFClient::UI::Toplevel;
1030 1953
10311 19541
1032 1955

Diff Legend

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