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.34 by elmex, Sun Apr 9 02:44:51 2006 UTC vs.
Revision 1.38 by root, Sun Apr 9 21:34:49 2006 UTC

… …
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 10our $FOCUS; # the widget with current focus
11#our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS }
16sub feed_sdl_button_down_event { } 15sub feed_sdl_button_down_event { }
… …
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24 23
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
40 $self->{y} = $y; 27 $self->{y} = $y;
41 $self->{z} = $z if defined $z; 28 $self->{z} = $z if defined $z;
… …
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42 $self->w ($w);
43 $self->h ($h);
50} 44}
51 45
52sub focus_in { 46sub focus_in {
53 my ($widget) = @_; 47 my ($widget) = @_;
54 $FOCUS = $widget; 48 $FOCUS = $widget;
… …
72 66
73sub button_up { 67sub button_up {
74 my ($widget, $sdlev) = @_; 68 my ($widget, $sdlev) = @_;
75} 69}
76 70
77sub w { $_[0]->{w} } 71sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 72sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 73sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 74sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 75sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 76
83sub draw { 77sub draw {
… …
88 $self->_draw; 82 $self->_draw;
89 glPopMatrix; 83 glPopMatrix;
90} 84}
91 85
92sub _draw { 86sub _draw {
93 my ($widget) = @_; 87 my ($self) = @_;
88
89 warn "no draw defined for $self\n";
94} 90}
95 91
96sub bbox { 92sub bbox {
97 my ($self) = @_; 93 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 94 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 98 $self->{x} = $w,
103 $self->{y} = $h 99 $self->{y} = $h
104 ) 100 )
105} 101}
106 102
103sub find_widget {
104 my ($self, $x, $y) = @_;
105
106 return $self
107 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
108 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
109
110 ()
111}
112
107sub del_parent { $_[0]->{parent} = undef } 113sub del_parent { $_[0]->{parent} = undef }
108 114
109sub set_parent { 115sub set_parent {
110 my ($self, $par) = @_; 116 my ($self, $par) = @_;
111 117
… …
132 138
133package Crossfire::Client::Widget::Container; 139package Crossfire::Client::Widget::Container;
134 140
135our @ISA = Crossfire::Client::Widget::; 141our @ISA = Crossfire::Client::Widget::;
136 142
137use SDL::OpenGL; 143sub new {
144 my ($class, @widgets) = @_;
138 145
139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 146 my $self = $class->SUPER::new (children => []);
140sub get { $_[0]->{child} } 147 $self->add ($_) for @widgets;
148
149 $self
150}
151
152sub add {
153 my ($self, $chld, $expand) = @_;
154
155 $chld->{expand} = $expand;
156 $chld->set_parent ($self);
157
158 @{$self->{children}} =
159 sort { $a->{z} <=> $b->{z} }
160 @{$self->{children}}, $chld;
161
162 $self->size_allocate ($self->{w}, $self->{h});
163}
164
141sub remove { 165sub remove {
166 my ($self, $widget) = @_;
167
168 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
169
170 $self->size_allocate ($self->{w}, $self->{h});
171}
172
173sub find_widget {
174 my ($self, $x, $y) = @_;
175
176 my $res;
177
178 for (@{ $self->{children} }) {
179 $res = $_->find_widget ($x, $y)
180 and return $res;
181 }
182
183 ()
184}
185
186sub size_request {
187 my ($self) = @_;
188
189 my ($hs, $ws) = (0, 0);
190 for (@{$self->{children} || []}) {
191 my ($w, $h) = $_->size_request;
192 $hs += $h;
193 if ($ws < $w) { $ws = $w }
194 }
195
196 return ($ws, $hs);
197}
198
199sub _draw {
200 my ($self) = @_;
201
202 $_->draw for @{$self->{children}};
203}
204
205package Crossfire::Client::Widget::Bin;
206
207our @ISA = Crossfire::Client::Widget::Container::;
208
209sub get { $_[0]->{children}[0] }
210
211sub size_request {
212 $_[0]{children}[0]->size_request if $_[0]{children}[0];
213}
214
215sub size_allocate {
142 my ($self, $chld) = @_; 216 my ($self, $w, $h) = @_;
143 delete $self->{child} 217 $self->SUPER::size_allocate ($w, $h);
144 if $self->{child} == $chld; 218 $self->{children}[0]->size_allocate ($w, $h)
219 if $self->{children}[0]
145} 220}
146
147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
148
149sub _draw { die "Containers can't be drawn!" }
150 221
151package Crossfire::Client::Widget::Toplevel; 222package Crossfire::Client::Widget::Toplevel;
152 223
224our @ISA = Crossfire::Client::Widget::Container::;
225
226sub update {
227 my ($self) = @_;
228
229 ::refresh ();
230}
231
232package Crossfire::Client::Widget::Window;
233
153our @ISA = Crossfire::Client::Widget::; 234our @ISA = Crossfire::Client::Widget::Bin::;
154 235
155use SDL::OpenGL; 236use SDL::OpenGL;
156 237
157sub add { 238sub add {
158 my ($self, $chld) = @_; 239 my ($self, $chld) = @_;
159 240 warn "ADD $chld\n";
160 push @{$self->{childs}}, $chld;
161 @{$self->{childs}} =
162 sort { $a->{z} <=> $b->{z} }
163 @{$self->{childs}};
164
165 $chld->set_parent ($self);
166}
167
168sub remove {
169 my ($self, $chld) = @_;
170 @{$self->{childs}} =
171 sort { $a->{z} <=> $b->{z} }
172 grep { $_ && $_ != $_[0] }
173 @{$self->{childs}}
174}
175
176sub update {
177 my ($self) = @_;
178 ::refresh ();
179}
180
181sub _draw {
182 my ($self) = @_;
183
184 $_->draw for @{$self->{childs}};
185}
186
187package Crossfire::Client::Widget::Window;
188
189our @ISA = Crossfire::Client::Widget::Container::;
190
191use SDL::OpenGL;
192
193sub add {
194 my ($self, $chld) = @_;
195 $self->SUPER::add ($chld); 241 $self->SUPER::add ($chld);
196 $chld->set_parent ($self); 242 $chld->set_parent ($self);
197 $self->update; #TODO: Move this to the size_request event propably?
198} 243}
199 244
200sub remove { 245sub remove {
201 my ($self) = @_; 246 my ($self) = @_;
202 # TODO FIXME: removing a child from a window will crash, see render_chld 247 # TODO FIXME: removing a child from a window will crash, see render_chld
203 $self->update; 248 # $self->update;
204} 249}
205 250
206sub update { 251sub update {
207 my ($self) = @_; 252 my ($self) = @_;
208 $self->render_chld; 253 $self->render_chld;
… …
211sub render_chld { 256sub render_chld {
212 my ($self) = @_; 257 my ($self) = @_;
213 my $chld = $self->get; 258 my $chld = $self->get;
214 my ($w, $h) = $self->size_request; 259 my ($w, $h) = $self->size_request;
215 260
261 require Carp;
262 Carp::cluck "RENDERCHI $w $h";
263 warn "RENDERCHI $w $h\n";
216 $self->{texture} = 264 $self->{texture} =
217 Crossfire::Client::Texture->new_from_opengl ( 265 Crossfire::Client::Texture->new_from_opengl (
218 $w, $h, sub { $chld->draw } 266 $w, $h, sub { $chld->draw }
219 ); 267 );
220 $self->{texture}->upload; 268 $self->{texture}->upload;
221} 269}
222 270
223sub size_request { 271sub size_request {
224 my ($self) = @_; 272 my ($self) = @_;
225 my $chld = $self->get 273 ($self->w, $self->h)
226 or return (0, 0); 274}
227 $chld->size_request 275
276sub size_allocate {
277 my ($self, $w, $h) = @_;
278
279 $self->w ($w);
280 $self->h ($h);
281 $self->get->size_allocate ($w, $h);
282
283 $self->update; #TODO: Move this to the size_request event propably?
228} 284}
229 285
230sub _draw { 286sub _draw {
231 my ($self) = @_; 287 my ($self) = @_;
232 288
233 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 289 my ($w, $h) = ($self->w, $self->h);
234 290
235 my $tex = $self->{texture} 291 my $tex = $self->{texture}
236 or return; 292 or return;
237 293
238 glEnable GL_BLEND; 294 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D; 295 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 297 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244 298
245 glBegin GL_QUADS; 299 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0; 300 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h; 301 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h; 302 glTexCoord 1, 1; glVertex $w, $h;
… …
253 glDisable GL_TEXTURE_2D; 307 glDisable GL_TEXTURE_2D;
254} 308}
255 309
256package Crossfire::Client::Widget::Frame; 310package Crossfire::Client::Widget::Frame;
257 311
258our @ISA = Crossfire::Client::Widget::Container::; 312our @ISA = Crossfire::Client::Widget::Bin::;
259 313
260use SDL::OpenGL; 314use SDL::OpenGL;
261 315
262sub size_request { 316sub size_request {
263 my ($self) = @_; 317 my ($self) = @_;
… …
265 or return (0, 0); 319 or return (0, 0);
266 320
267 $chld->move (2, 2); 321 $chld->move (2, 2);
268 322
269 map { $_ + 4 } $chld->size_request; 323 map { $_ + 4 } $chld->size_request;
324}
325
326sub size_allocate {
327 my ($self, $w, $h) = @_;
328
329 $self->w ($w);
330 $self->h ($h);
331
332 $self->get->size_allocate ($w - 4, $h - 4);
333 $self->get->move (2, 2);
270} 334}
271 335
272sub _draw { 336sub _draw {
273 my ($self) = @_; 337 my ($self) = @_;
274 338
… …
300 $self->{txts} = [ 364 $self->{txts} = [
301 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 365 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
302 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 366 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
303 ]; 367 ];
304 $self 368 $self
305
306} 369}
307 370
308sub size_request { 371sub size_request {
309 my ($self) = @_; 372 my ($self) = @_;
310 my ($w, $h) = $self->get->size_request; 373 my ($w, $h) = $self->get->size_request;
… …
312 $h += $self->{txts}->[1]->{height}; 375 $h += $self->{txts}->[1]->{height};
313 $h += $self->{txts}->[4]->{height}; 376 $h += $self->{txts}->[4]->{height};
314 $w += $self->{txts}->[2]->{width}; 377 $w += $self->{txts}->[2]->{width};
315 $w += $self->{txts}->[3]->{width}; 378 $w += $self->{txts}->[3]->{width};
316 379
380 ($w, $h)
381}
382
383sub size_allocate {
384 my ($self, $w, $h) = @_;
385
386 $self->w ($w);
387 $self->h ($h);
388 $h -= $self->{txts}->[1]->{height};
389 $h -= $self->{txts}->[4]->{height};
390 $w -= $self->{txts}->[2]->{width};
391 $w -= $self->{txts}->[3]->{width};
392
393 $h = $h < 0 ? 0 : $h;
394 $w = $w < 0 ? 0 : $w;
395 warn "CHILD:$w $h\n";
396 $self->get->size_allocate ($w, $h);
317 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 397 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
318
319 ($w, $h)
320} 398}
321 399
322sub _draw { 400sub _draw {
323 my ($self) = @_; 401 my ($self) = @_;
324 402
325 my ($w, $h) = $self->size_request; 403 my ($w, $h) = ($self->w, $self->h);
326 my ($cw, $ch) = $self->get->size_request; 404 my ($cw, $ch) = ($self->get->w, $self->get->h);
327 405
328 glEnable GL_BLEND; 406 glEnable GL_BLEND;
329 glEnable GL_TEXTURE_2D; 407 glEnable GL_TEXTURE_2D;
330 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
332
333 410
334 my $top = $self->{txts}->[1]; 411 my $top = $self->{txts}->[1];
335 glBindTexture GL_TEXTURE_2D, $top->{name}; 412 glBindTexture GL_TEXTURE_2D, $top->{name};
336 413
337 glColor 1, 1, 1, 0.8;
338
339 glBegin GL_QUADS; 414 glBegin GL_QUADS;
340 glTexCoord 0, 0; glVertex 0 , 0; 415 glTexCoord 0, 0; glVertex 0 , 0;
341 glTexCoord 0, 1; glVertex 0 , $top->{height}; 416 glTexCoord 0, 1; glVertex 0 , $top->{height};
342 glTexCoord 1, 1; glVertex $w , $top->{height}; 417 glTexCoord 1, 1; glVertex $w , $top->{height};
343 glTexCoord 1, 0; glVertex $w , 0; 418 glTexCoord 1, 0; glVertex $w , 0;
344 glEnd; 419 glEnd;
345 420
346 my $left = $self->{txts}->[3]; 421 my $left = $self->{txts}->[3];
347 glBindTexture GL_TEXTURE_2D, $left->{name}; 422 glBindTexture GL_TEXTURE_2D, $left->{name};
348 423
349 glColor 1, 1, 1, 0.8;
350
351 glBegin GL_QUADS; 424 glBegin GL_QUADS;
352 glTexCoord 0, 0; glVertex 0 , $top->{height}; 425 glTexCoord 0, 0; glVertex 0 , $top->{height};
353 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 426 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
354 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 427 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
355 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 428 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
356 glEnd; 429 glEnd;
357 430
358 my $right = $self->{txts}->[2]; 431 my $right = $self->{txts}->[2];
359 glBindTexture GL_TEXTURE_2D, $right->{name}; 432 glBindTexture GL_TEXTURE_2D, $right->{name};
360 433
361 glColor 1, 1, 1, 0.8;
362
363 glBegin GL_QUADS; 434 glBegin GL_QUADS;
364 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 435 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
365 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 436 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
366 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 437 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
367 glTexCoord 1, 0; glVertex $w , $top->{height}; 438 glTexCoord 1, 0; glVertex $w , $top->{height};
368 glEnd; 439 glEnd;
369 440
370 my $bottom = $self->{txts}->[4]; 441 my $bottom = $self->{txts}->[4];
371 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 442 glBindTexture GL_TEXTURE_2D, $bottom->{name};
372 443
373 glColor 1, 1, 1, 0.8;
374
375 glBegin GL_QUADS; 444 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 445 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
377 glTexCoord 0, 1; glVertex 0 , $h; 446 glTexCoord 0, 1; glVertex 0 , $h;
378 glTexCoord 1, 1; glVertex $w , $h; 447 glTexCoord 1, 1; glVertex $w , $h;
379 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 448 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
380 glEnd; 449 glEnd;
381 450
382 my $bg = $self->{txts}->[0]; 451 my $bg = $self->{txts}->[0];
383 glBindTexture GL_TEXTURE_2D, $bg->{name}; 452 glBindTexture GL_TEXTURE_2D, $bg->{name};
453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
384 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 454 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
385 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 455 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
386 456
387 glColor 1, 1, 1, 0.8;
388
389 my $rep_x = $cw / $bg->{width}; 457 my $rep_x = $cw / $bg->{width};
390 my $rep_y = $ch / $bg->{height}; 458 my $rep_y = $ch / $bg->{height};
391 459
392 glBegin GL_QUADS; 460 glBegin GL_QUADS;
393 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 461 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
394 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 462 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
395 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 463 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
396 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 464 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
397 glEnd; 465 glEnd;
398
399 $self->get->draw;
400 466
401 glDisable GL_BLEND; 467 glDisable GL_BLEND;
402 glDisable GL_TEXTURE_2D; 468 glDisable GL_TEXTURE_2D;
469
470 $self->get->draw;
471
403} 472}
404 473
405package Crossfire::Client::Widget::Table; 474package Crossfire::Client::Widget::Table;
406 475
407our @ISA = Crossfire::Client::Widget::Container::; 476our @ISA = Crossfire::Client::Widget::Bin::;
408 477
409use SDL::OpenGL; 478use SDL::OpenGL;
410 479
411sub add { 480sub add {
412 my ($self, $x, $y, $chld) = @_; 481 my ($self, $x, $y, $chld) = @_;
413 my $old_chld = $self->{childs}[$y][$x]; 482 my $old_chld = $self->{children}[$y][$x];
414 483
415 $self->{childs}[$y][$x] = $chld; 484 $self->{children}[$y][$x] = $chld;
416 $chld->set_parent ($self); 485 $chld->set_parent ($self);
417 $self->update; 486 $self->update;
418} 487}
419 488
420sub max_row_height { 489sub max_row_height {
421 my ($self, $row) = @_; 490 my ($self, $row) = @_;
422 491
423 my $hs = 0; 492 my $hs = 0;
424 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 493 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
425 my $c = $self->{childs}->[$row]->[$xi]; 494 my $c = $self->{children}->[$row]->[$xi];
426 if ($c) { 495 if ($c) {
427 my ($w, $h) = $c->size_request; 496 my ($w, $h) = $c->size_request;
428 if ($hs < $h) { $hs = $h } 497 if ($hs < $h) { $hs = $h }
429 } 498 }
430 } 499 }
… …
433 502
434sub max_col_width { 503sub max_col_width {
435 my ($self, $col) = @_; 504 my ($self, $col) = @_;
436 505
437 my $ws = 0; 506 my $ws = 0;
438 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 507 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
439 my $c = ($self->{childs}->[$yi] || [])->[$col]; 508 my $c = ($self->{children}->[$yi] || [])->[$col];
440 if ($c) { 509 if ($c) {
441 my ($w, $h) = $c->size_request; 510 my ($w, $h) = $c->size_request;
442 if ($ws < $w) { $ws = $w } 511 if ($ws < $w) { $ws = $w }
443 } 512 }
444 } 513 }
… …
448sub size_request { 517sub size_request {
449 my ($self) = @_; 518 my ($self) = @_;
450 519
451 my ($hs, $ws) = (0, 0); 520 my ($hs, $ws) = (0, 0);
452 521
453 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 522 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
454 $hs += $self->max_row_height ($yi); 523 $hs += $self->max_row_height ($yi);
455 } 524 }
456 525
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 526 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 my $wm = 0; 527 my $wm = 0;
459 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 528 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
460 $wm += $self->max_col_width ($xi) 529 $wm += $self->max_col_width ($xi)
461 } 530 }
462 if ($ws < $wm) { $ws = $wm } 531 if ($ws < $wm) { $ws = $wm }
463 } 532 }
464 533
… …
467 536
468sub _draw { 537sub _draw {
469 my ($self) = @_; 538 my ($self) = @_;
470 539
471 my $y = 0; 540 my $y = 0;
472 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 541 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
473 my $x = 0; 542 my $x = 0;
474 543
475 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 544 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
476 545
477 my $c = $self->{childs}->[$yi]->[$xi]; 546 my $c = $self->{children}->[$yi]->[$xi];
478 if ($c) { 547 if ($c) {
479 $c->move ($x, $y, 0); #TODO: Move to size_request 548 $c->move ($x, $y, 0); #TODO: Move to size_request
480 $c->draw if $c; 549 $c->draw if $c;
481 } 550 }
482 551
… …
491 560
492our @ISA = Crossfire::Client::Widget::Container::; 561our @ISA = Crossfire::Client::Widget::Container::;
493 562
494use SDL::OpenGL; 563use SDL::OpenGL;
495 564
496sub add { 565sub size_allocate {
497 my ($self, $chld) = @_; 566 my ($self, $w, $h) = @_;
498 push @{$self->{childs}}, $chld;
499 $chld->set_parent ($self);
500 $self->update;
501}
502 567
503sub size_request { 568 $self->w ($w);
504 my ($self) = @_; 569 $self->h ($h);
505 570
506 my ($hs, $ws) = (0, 0); 571 my $exp;
572 my @oth;
573 # find expand widget
507 for (@{$self->{childs} || []}) { 574 for (@{$self->{children}}) {
575 if ($_->{expand}) {
576 $exp = $_;
577 last;
578 }
579 push @oth, $_;
580 }
581
582 my ($ow, $oh);
583
584 # get sizes of other widgets
585 for (@oth) {
508 my ($w, $h) = $_->size_request; 586 my ($w, $h) = $_->size_request;
509 $hs += $h; 587 $oh += $h;
510 if ($ws < $w) { $ws = $w } 588 if ($ow < $w) { $ow = $w }
511 } 589 }
512 590
513 return ($ws, $hs); 591 my $y = 0;
592 for (@{$self->{children}}) {
593 $_->move (0, $y);
594
595 if ($_ == $exp) {
596 $_->size_allocate ($w, $h - $oh);
597 $y += $h - $oh;
598 } else {
599 my ($cw, $h) = $_->size_request;
600 $_->size_allocate ($w, $h);
601 $y += $h;
602 }
603 }
514} 604}
515 605
516sub _draw { 606sub _draw {
517 my ($self) = @_; 607 my ($self) = @_;
518 608
519 my ($x, $y); 609 my ($x, $y);
520 for (@{$self->{childs} || []}) { 610 for (@{$self->{children} || []}) {
521 $_->move (0, $y, 0); #TODO: move to size_request
522 $_->draw; 611 $_->draw;
523 my ($w, $h) = $_->size_request;
524 $y += $h; 612 $y += $_->h;
525 } 613 }
526} 614}
527 615
528package Crossfire::Client::Widget::Label; 616package Crossfire::Client::Widget::Label;
529 617
… …
575 glEnable GL_TEXTURE_2D; 663 glEnable GL_TEXTURE_2D;
576 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 664 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 666 glBindTexture GL_TEXTURE_2D, $tex->{name};
579 667
580 glColor 1, 1, 1, 0.6; # TODO color 668 glColor 1, 0, 0, 1; # TODO color
581 669
582 glBegin GL_QUADS; 670 glBegin GL_QUADS;
583 glTexCoord 0, 0; glVertex 0 , 0; 671 glTexCoord 0, 0; glVertex 0 , 0;
584 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 672 glTexCoord 0, 1; glVertex 0 , $tex->{height};
585 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 673 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
… …
615 $text .= chr $uni; 703 $text .= chr $uni;
616 } 704 }
617 $self->set_text ($text); 705 $self->set_text ($text);
618} 706}
619 707
620
621# XXX: TextView isn't neccessary with pango multiline text rendering
622package Crossfire::Client::Widget::TextView;
623
624use strict;
625
626our @ISA = qw/Crossfire::Client::Widget/;
627
628use SDL::OpenGL;
629use SDL::OpenGL::Constants;
630
631sub new {
632 my ($class, $text, $h) = @_;
633 my $self = $class->SUPER::new ();
634
635 $self->{txt_height} = $h;
636 @{$self->{lines}} = split /\r?\n/, $text;
637
638 for (split /\r?\n/, $text) {
639 $self->add_line ($_);
640 }
641 $self
642}
643
644#sub render_lines {
645# my ($self) = @_;
646#
647# $self->{txt_lines} = [];
648#
649# for (@{$self->{lines}}) {
650# push @{$self->{txt_lines}},
651# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
652# }
653#}
654
655sub add_line {
656 my ($self, $line) = @_;
657 push @{$self->{lines}}, $line;
658
659 push @{$self->{txt_lines}},
660 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
661}
662
663sub size_request {
664 my ($self) = @_;
665
666 my $w = 0;
667 my $h = 0;
668
669 for (@{$self->{txt_lines}}) {
670 if ($w < $_->{width}) { $w = $_->{width} }
671 $h += $_->{height};
672 }
673
674 return ($w, $h);
675}
676
677sub draw_line {
678 my ($self, $tex, $y) = @_;
679
680 glBindTexture GL_TEXTURE_2D, $tex->{name};
681
682 glColor 1, 0, 1;
683
684 glBegin GL_QUADS;
685 glTexCoord 0, 0; glVertex 0 , $y;
686 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
687 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
688 glTexCoord 1, 0; glVertex $tex->{width}, $y;
689 glEnd;
690}
691
692sub _draw {
693 my ($self) = @_;
694
695 glEnable GL_BLEND;
696 glEnable GL_TEXTURE_2D;
697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
698
699 my $l = 0;
700 for (@{$self->{txt_lines}}) {
701 $self->draw_line ($_, $l);
702 $l += $_->{height};
703 }
704
705 glDisable GL_BLEND;
706 glDisable GL_TEXTURE_2D;
707}
708
709package Crossfire::Client::Widget::MapWidget; 708package Crossfire::Client::Widget::MapWidget;
710 709
711use strict; 710use strict;
712 711
713use List::Util qw(min max); 712use List::Util qw(min max);
… …
721sub key_down { 720sub key_down {
722 print "MAPKEYDOWN\n"; 721 print "MAPKEYDOWN\n";
723} 722}
724 723
725sub key_up { 724sub key_up {
725}
726
727sub size_request {
728
729}
730
731sub size_allocate {
726} 732}
727 733
728sub _draw { 734sub _draw {
729 my ($self) = @_; 735 my ($self) = @_;
730 736
… …
750 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 756 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
751 } 757 }
752 758
753 glEnable GL_TEXTURE_2D; 759 glEnable GL_TEXTURE_2D;
754 glEnable GL_BLEND; 760 glEnable GL_BLEND;
755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
762
763 my $sw4 = ($sw + 3) & ~3;
764 my $lighting = "\x00" x ($sw4 * $sh);
756 765
757 for my $x (0 .. $sw - 1) { 766 for my $x (0 .. $sw - 1) {
758 for my $y (0 .. $sh - 1) { 767 for my $y (0 .. $sh - 1) {
759 768
760 my $cell = $map->[$x + $xofs][$y + $yofs] 769 my $cell = $map->[$x + $xofs][$y + $yofs]
761 or next; 770 or next;
762 771
763 my $darkness = $cell->[0] * (1 / 255); 772 my $darkness = $cell->[0] * (1 / 255);
764 if ($darkness < 0) { 773 if ($darkness < 0) {
765 glColor 0.3, 0.3, 0.3; 774 $darkness = 0.15;
766 } else {
767 glColor $darkness, $darkness, $darkness;
768 } 775 }
776 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
769 777
770 for my $num (grep $_, @$cell[1,2,3]) { 778 for my $num (grep $_, @$cell[1,2,3]) {
771 my $tex = $::CONN->{face}[$num]{texture} || next; 779 my $tex = $::CONN->{face}[$num]{texture} || next;
772 780
773 glBindTexture GL_TEXTURE_2D, $tex->{name}; 781 glBindTexture GL_TEXTURE_2D, $tex->{name};
… …
785 glTexCoord 1, 0; glVertex $px + $w, $py; 793 glTexCoord 1, 0; glVertex $px + $w, $py;
786 glEnd; 794 glEnd;
787 } 795 }
788 } 796 }
789 } 797 }
798
799# if (1) { # higher quality darkness
800# $lighting =~ s/(.)/$1$1$1/gs;
801# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
802#
803# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
804#
805# $lighting = $pb->get_pixels;
806# $lighting =~ s/(.)../$1/gs;
807# }
808
809 $lighting = new Crossfire::Client::Texture
810 width => $sw4,
811 height => $sh,
812 data => $lighting,
813 internalformat => GL_ALPHA4,
814 format => GL_ALPHA;
815
816 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
817 glColor 0, 0, 0, 0.75;
818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
819 glBindTexture GL_TEXTURE_2D, $lighting->{name};
820 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
821 glBegin GL_QUADS;
822 glTexCoord 0, 0; glVertex 0 , 0;
823 glTexCoord 0, 1; glVertex 0 , $sh * 32;
824 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
825 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
826 glEnd;
790 827
791 glDisable GL_TEXTURE_2D; 828 glDisable GL_TEXTURE_2D;
792 glDisable GL_BLEND; 829 glDisable GL_BLEND;
793} 830}
794 831
… …
841 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 878 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
842 $::CONN->send ("command run_stop"); 879 $::CONN->send ("command run_stop");
843 } 880 }
844} 881}
845 882
883package Crossfire::Client::Widget::Animator;
884
885use SDL::OpenGL;
886
887our @ISA = Crossfire::Client::Widget::Bin::;
888
889sub moveto {
890 my ($self, $x, $y) = @_;
891
892 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
893 $self->{speed} = 0.2;
894 $self->{time} = 1;
895
896 ::animation_start $self;
897}
898
899sub animate {
900 my ($self, $interval) = @_;
901
902 $self->{time} -= $interval * $self->{speed};
903 if ($self->{time} <= 0) {
904 $self->{time} = 0;
905 ::animation_stop $self;
906 }
907
908 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
909
910 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
911 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
912}
913
914sub _draw {
915 my ($self) = @_;
916
917 glPushMatrix;
918 glRotate $self->{time} * 10000, 0, 1, 0;
919 $self->{children}[0]->draw;
920 glPopMatrix;
921}
922
8461; 9231;
847 924

Diff Legend

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