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.39 by root, Sun Apr 9 21:39:08 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

… …
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11 11
12# class methods for events 12# class methods for events
13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
15sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
16sub feed_sdl_button_up_event { } 16sub feed_sdl_button_up_event { }
17 17
18sub new { 18sub new {
19 my $class = shift; 19 my $class = shift;
… …
37 Carp::confess "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38} 38}
39 39
40sub size_allocate { 40sub size_allocate {
41 my ($self, $w, $h) = @_; 41 my ($self, $w, $h) = @_;
42
42 $self->w ($w); 43 $self->{w} = $w;
43 $self->h ($h); 44 $self->{h} = $h;
44} 45}
45 46
46sub focus_in { 47sub focus_in {
47 my ($widget) = @_; 48 my ($widget) = @_;
48 $FOCUS = $widget; 49 $::FOCUS = $widget;
49} 50}
50 51
51sub focus_out { 52sub focus_out {
52 my ($widget) = @_; 53 my ($widget) = @_;
53} 54}
… …
78 my ($self) = @_; 79 my ($self) = @_;
79 80
80 glPushMatrix; 81 glPushMatrix;
81 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
82 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glEnable GL_BLEND;
87 glBegin GL_QUADS;
88 glVertex 0, 0;
89 glVertex $self->{w} - 1, 0;
90 glVertex $self->{w} - 1, $self->{h} - 1;
91 glVertex 0, $self->{h} - 1;
92 glEnd;
93 glDisable GL_BLEND;
94 }
83 glPopMatrix; 95 glPopMatrix;
84} 96}
85 97
86sub _draw { 98sub _draw {
87 my ($self) = @_; 99 my ($self) = @_;
… …
159 171
160 @{$self->{children}} = 172 @{$self->{children}} =
161 sort { $a->{z} <=> $b->{z} } 173 sort { $a->{z} <=> $b->{z} }
162 @{$self->{children}}, $chld; 174 @{$self->{children}}, $chld;
163 175
164 $self->size_allocate ($self->{w}, $self->{h}); 176 $self->size_allocate ($self->{w}, $self->{h})
177 if $self->{w}; #TODO: check for "realised state"
165} 178}
166 179
167sub remove { 180sub remove {
168 my ($self, $widget) = @_; 181 my ($self, $widget) = @_;
169 182
… …
173} 186}
174 187
175sub find_widget { 188sub find_widget {
176 my ($self, $x, $y) = @_; 189 my ($self, $x, $y) = @_;
177 190
191 $x -= $self->{x};
192 $y -= $self->{y};
193
178 my $res; 194 my $res;
179 195
180 for (@{ $self->{children} }) { 196 for (reverse @{ $self->{children} }) {
181 $res = $_->find_widget ($x, $y) 197 $res = $_->find_widget ($x, $y)
182 and return $res; 198 and return $res;
183 } 199 }
184 200
185 () 201 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
186}
187
188sub size_request {
189 my ($self) = @_;
190
191 my ($hs, $ws) = (0, 0);
192 for (@{$self->{children} || []}) {
193 my ($w, $h) = $_->size_request;
194 $hs += $h;
195 if ($ws < $w) { $ws = $w }
196 }
197
198 return ($ws, $hs);
199} 202}
200 203
201sub _draw { 204sub _draw {
202 my ($self) = @_; 205 my ($self) = @_;
203 206
… …
216 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
217} 220}
218 221
219sub size_allocate { 222sub size_allocate {
220 my ($self, $w, $h) = @_; 223 my ($self, $w, $h) = @_;
224
221 $self->SUPER::size_allocate ($w, $h); 225 $self->SUPER::size_allocate ($w, $h);
222 $self->{children}[0]->size_allocate ($w, $h) 226 $self->{children}[0]->size_allocate ($w, $h)
223 if $self->{children}[0] 227 if $self->{children}[0]
224} 228}
225 229
… …
233 my ($self) = @_; 237 my ($self) = @_;
234 238
235 ::refresh (); 239 ::refresh ();
236} 240}
237 241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
238############################################################################# 250#############################################################################
239 251
240package Crossfire::Client::Widget::Window; 252package Crossfire::Client::Widget::Window;
241 253
242our @ISA = Crossfire::Client::Widget::Bin::; 254our @ISA = Crossfire::Client::Widget::Bin::;
243 255
244use SDL::OpenGL; 256use SDL::OpenGL;
245 257
246sub add { 258sub new {
247 my ($self, $chld) = @_; 259 my ($class, $x, $y, $z, $w, $h) = @_;
248 warn "ADD $chld\n";
249 $self->SUPER::add ($chld);
250 $chld->set_parent ($self);
251}
252 260
253sub remove { 261 my $self = $class->SUPER::new;
254 my ($self) = @_; 262
255 # TODO FIXME: removing a child from a window will crash, see render_chld 263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
256 # $self->update;
257} 264}
258 265
259sub update { 266sub update {
260 my ($self) = @_; 267 my ($self) = @_;
268
261 $self->render_chld; 269 $self->render_chld;
270 $self->SUPER::update;
262} 271}
263 272
264sub render_chld { 273sub render_chld {
265 my ($self) = @_; 274 my ($self) = @_;
266 my $chld = $self->get;
267 my ($w, $h) = $self->size_request;
268 275
269 require Carp;
270 Carp::cluck "RENDERCHI $w $h";
271 warn "RENDERCHI $w $h\n";
272 $self->{texture} = 276 $self->{texture} =
273 Crossfire::Client::Texture->new_from_opengl ( 277 Crossfire::Client::Texture->new_from_opengl (
274 $w, $h, sub { $chld->draw } 278 $self->{w}, $self->{h}, sub { $self->child->draw }
275 ); 279 );
276 $self->{texture}->upload;
277}
278
279sub size_request {
280 my ($self) = @_;
281 ($self->w, $self->h)
282} 280}
283 281
284sub size_allocate { 282sub size_allocate {
285 my ($self, $w, $h) = @_; 283 my ($self, $w, $h) = @_;
286 284
287 $self->w ($w); 285 $self->{w} = $w;
288 $self->h ($h); 286 $self->{h} = $h;
287
289 $self->get->size_allocate ($w, $h); 288 $self->child->size_allocate ($w, $h);
290 289
291 $self->update; #TODO: Move this to the size_request event propably? 290 $self->render_chld;
292} 291}
293 292
294sub _draw { 293sub _draw {
295 my ($self) = @_; 294 my ($self) = @_;
296 295
… …
333 map { $_ + 4 } $chld->size_request; 332 map { $_ + 4 } $chld->size_request;
334} 333}
335 334
336sub size_allocate { 335sub size_allocate {
337 my ($self, $w, $h) = @_; 336 my ($self, $w, $h) = @_;
338 337
339 $self->w ($w); 338 $self->{w} = $w;
340 $self->h ($h); 339 $self->{h} = $h;
341 340
342 $self->child->size_allocate ($w - 4, $h - 4); 341 $self->child->size_allocate ($w - 4, $h - 4);
343 $self->child->move (2, 2); 342 $self->child->move (2, 2);
344} 343}
345 344
… …
363 362
364############################################################################# 363#############################################################################
365 364
366package Crossfire::Client::Widget::FancyFrame; 365package Crossfire::Client::Widget::FancyFrame;
367 366
368our @ISA = Crossfire::Client::Widget::Frame::; 367our @ISA = Crossfire::Client::Widget::Bin::;
369 368
370use SDL::OpenGL; 369use SDL::OpenGL;
371 370
372sub new { 371my @tex =
373 my ($self, $theme) = @_;
374 $self = $self->SUPER::new;
375
376 $self->{txts} = [
377 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
378 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
379 ];
380 $self
381}
382 374
383sub size_request { 375sub size_request {
384 my ($self) = @_; 376 my ($self) = @_;
385 377
386 my ($w, $h) = $self->SUPER::size_request; 378 my ($w, $h) = $self->SUPER::size_request;
387 379
388 $h += $self->{txts}->[1]->{height}; 380 $h += $tex[1]->{height};
389 $h += $self->{txts}->[4]->{height}; 381 $h += $tex[4]->{height};
390 $w += $self->{txts}->[2]->{width}; 382 $w += $tex[2]->{width};
391 $w += $self->{txts}->[3]->{width}; 383 $w += $tex[3]->{width};
392 384
393 ($w, $h) 385 ($w, $h)
394} 386}
395 387
396sub size_allocate { 388sub size_allocate {
397 my ($self, $w, $h) = @_; 389 my ($self, $w, $h) = @_;
398 390
399 $self->w ($w); 391 $self->SUPER::size_allocate ($w, $h);
400 $self->h ($h); 392
401 $h -= $self->{txts}->[1]->{height}; 393 $h -= $tex[1]->{height};
402 $h -= $self->{txts}->[4]->{height}; 394 $h -= $tex[4]->{height};
403 $w -= $self->{txts}->[2]->{width}; 395 $w -= $tex[2]->{width};
404 $w -= $self->{txts}->[3]->{width}; 396 $w -= $tex[3]->{width};
405 397
406 $h = $h < 0 ? 0 : $h; 398 $h = $h < 0 ? 0 : $h;
407 $w = $w < 0 ? 0 : $w; 399 $w = $w < 0 ? 0 : $w;
408 warn "CHILD:$w $h\n"; 400
409 $self->child->size_allocate ($w, $h); 401 $self->child->size_allocate ($w, $h);
410 $self->child->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 402 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
411} 403}
412 404
413sub _draw { 405sub _draw {
414 my ($self) = @_; 406 my ($self) = @_;
415 407
416 my ($w, $h) = ($self->w, $self->h); 408 my ($w, $h) = ($self->{w}, $self->{h});
417 my ($cw, $ch) = ($self->child->w, $self->child->h); 409 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
418 410
419 glEnable GL_BLEND; 411 glEnable GL_BLEND;
420 glEnable GL_TEXTURE_2D; 412 glEnable GL_TEXTURE_2D;
421 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
422 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
423 415
424 my $top = $self->{txts}->[1]; 416 my $top = $tex[1];
425 glBindTexture GL_TEXTURE_2D, $top->{name}; 417 glBindTexture GL_TEXTURE_2D, $top->{name};
426 418
427 glBegin GL_QUADS; 419 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , 0; 420 glTexCoord 0, 0; glVertex 0 , 0;
429 glTexCoord 0, 1; glVertex 0 , $top->{height}; 421 glTexCoord 0, 1; glVertex 0 , $top->{height};
430 glTexCoord 1, 1; glVertex $w , $top->{height}; 422 glTexCoord 1, 1; glVertex $w , $top->{height};
431 glTexCoord 1, 0; glVertex $w , 0; 423 glTexCoord 1, 0; glVertex $w , 0;
432 glEnd; 424 glEnd;
433 425
434 my $left = $self->{txts}->[3]; 426 my $left = $tex[3];
435 glBindTexture GL_TEXTURE_2D, $left->{name}; 427 glBindTexture GL_TEXTURE_2D, $left->{name};
436 428
437 glBegin GL_QUADS; 429 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex 0 , $top->{height}; 430 glTexCoord 0, 0; glVertex 0 , $top->{height};
439 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
442 glEnd; 434 glEnd;
443 435
444 my $right = $self->{txts}->[2]; 436 my $right = $tex[2];
445 glBindTexture GL_TEXTURE_2D, $right->{name}; 437 glBindTexture GL_TEXTURE_2D, $right->{name};
446 438
447 glBegin GL_QUADS; 439 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
449 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
450 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
451 glTexCoord 1, 0; glVertex $w , $top->{height}; 443 glTexCoord 1, 0; glVertex $w , $top->{height};
452 glEnd; 444 glEnd;
453 445
454 my $bottom = $self->{txts}->[4]; 446 my $bottom = $tex[4];
455 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
456 448
457 glBegin GL_QUADS; 449 glBegin GL_QUADS;
458 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
459 glTexCoord 0, 1; glVertex 0 , $h; 451 glTexCoord 0, 1; glVertex 0 , $h;
460 glTexCoord 1, 1; glVertex $w , $h; 452 glTexCoord 1, 1; glVertex $w , $h;
461 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
462 glEnd; 454 glEnd;
463 455
464 my $bg = $self->{txts}->[0]; 456 my $bg = $tex[0];
465 glBindTexture GL_TEXTURE_2D, $bg->{name}; 457 glBindTexture GL_TEXTURE_2D, $bg->{name};
466 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
467 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
468 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
469 461
… …
576package Crossfire::Client::Widget::VBox; 568package Crossfire::Client::Widget::VBox;
577 569
578our @ISA = Crossfire::Client::Widget::Container::; 570our @ISA = Crossfire::Client::Widget::Container::;
579 571
580use SDL::OpenGL; 572use SDL::OpenGL;
573
574sub size_request {
575 my ($self) = @_;
576
577 my @alloc = map [$_->size_request], @{$self->{children}};
578
579 (
580 (List::Util::max map $_->[0], @alloc),
581 (List::Util::sum map $_->[1], @alloc),
582 )
583}
581 584
582sub size_allocate { 585sub size_allocate {
583 my ($self, $w, $h) = @_; 586 my ($self, $w, $h) = @_;
584 587
585 $self->w ($w); 588 $self->w ($w);
… …
615 } else { 618 } else {
616 my ($cw, $h) = $_->size_request; 619 my ($cw, $h) = $_->size_request;
617 $_->size_allocate ($w, $h); 620 $_->size_allocate ($w, $h);
618 $y += $h; 621 $y += $h;
619 } 622 }
620 }
621}
622
623sub _draw {
624 my ($self) = @_;
625
626 my ($x, $y);
627 for (@{$self->{children} || []}) {
628 $_->draw;
629 $y += $_->h;
630 } 623 }
631} 624}
632 625
633############################################################################# 626#############################################################################
634 627

Diff Legend

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