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.49 by root, Sun Apr 9 22:26:51 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#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 { }
17sub feed_sdl_button_up_event { } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23} 22}
24
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 23
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;
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
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glBegin GL_QUADS;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glEnd;
92 }
89 glPopMatrix; 93 glPopMatrix;
90} 94}
91 95
92sub _draw { 96sub _draw {
93 my ($widget) = @_; 97 my ($self) = @_;
98
99 warn "no draw defined for $self\n";
94} 100}
95 101
96sub bbox { 102sub bbox {
97 my ($self) = @_; 103 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 104 my ($w, $h) = $self->size_request;
102 $self->{x} = $w, 108 $self->{x} = $w,
103 $self->{y} = $h 109 $self->{y} = $h
104 ) 110 )
105} 111}
106 112
113sub find_widget {
114 my ($self, $x, $y) = @_;
115
116 return $self
117 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
118 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
119
120 ()
121}
122
107sub del_parent { $_[0]->{parent} = undef } 123sub del_parent { $_[0]->{parent} = undef }
108 124
109sub set_parent { 125sub set_parent {
110 my ($self, $par) = @_; 126 my ($self, $par) = @_;
111 127
128 my ($self) = @_; 144 my ($self) = @_;
129 145
130 #$self->deactivate; 146 #$self->deactivate;
131} 147}
132 148
149#############################################################################
150
133package Crossfire::Client::Widget::Container; 151package Crossfire::Client::Widget::Container;
134 152
135our @ISA = Crossfire::Client::Widget::; 153our @ISA = Crossfire::Client::Widget::;
136 154
155sub new {
156 my ($class, @widgets) = @_;
157
158 my $self = $class->SUPER::new (children => []);
159 $self->add ($_) for @widgets;
160
161 $self
162}
163
164sub add {
165 my ($self, $chld, $expand) = @_;
166
167 $chld->{expand} = $expand;
168 $chld->set_parent ($self);
169
170 @{$self->{children}} =
171 sort { $a->{z} <=> $b->{z} }
172 @{$self->{children}}, $chld;
173
174 $self->size_allocate ($self->{w}, $self->{h})
175 if $self->{w}; #TODO: check for "realised state"
176}
177
178sub remove {
179 my ($self, $widget) = @_;
180
181 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
182
183 $self->size_allocate ($self->{w}, $self->{h});
184}
185
186sub find_widget {
187 my ($self, $x, $y) = @_;
188
189 $x -= $self->{x};
190 $y -= $self->{y};
191
192 my $res;
193
194 for (reverse @{ $self->{children} }) {
195 $res = $_->find_widget ($x, $y)
196 and return $res;
197 }
198
199 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
210package Crossfire::Client::Widget::Bin;
211
212our @ISA = Crossfire::Client::Widget::Container::;
213
214sub child { $_[0]->{children}[0] }
215
216sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
218}
219
220sub size_allocate {
221 my ($self, $w, $h) = @_;
222
223 $self->SUPER::size_allocate ($w, $h);
224 $self->{children}[0]->size_allocate ($w, $h)
225 if $self->{children}[0]
226}
227
228#############################################################################
229
230package Crossfire::Client::Widget::Toplevel;
231
232our @ISA = Crossfire::Client::Widget::Container::;
233
234sub update {
235 my ($self) = @_;
236
237 ::refresh ();
238}
239
240sub add {
241 my ($self, $widget) = @_;
242
243 $self->SUPER::add ($widget);
244
245 $widget->size_allocate ($widget->size_request);
246}
247
248#############################################################################
249
250package Crossfire::Client::Widget::Window;
251
252our @ISA = Crossfire::Client::Widget::Bin::;
253
137use SDL::OpenGL; 254use SDL::OpenGL;
138 255
139sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 256sub new {
140sub get { $_[0]->{child} } 257 my ($class, $x, $y, $z, $w, $h) = @_;
141sub remove {
142 my ($self, $chld) = @_;
143 delete $self->{child}
144 if $self->{child} == $chld;
145}
146 258
147sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 259 my $self = $class->SUPER::new;
148 260
149sub _draw { die "Containers can't be drawn!" } 261 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
150
151package Crossfire::Client::Widget::Toplevel;
152
153our @ISA = Crossfire::Client::Widget::;
154
155use SDL::OpenGL;
156
157sub add {
158 my ($self, $chld) = @_;
159
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} 262}
175 263
176sub update { 264sub update {
177 my ($self) = @_; 265 my ($self) = @_;
178 ::refresh ();
179}
180 266
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);
196 $chld->set_parent ($self);
197 $self->update; #TODO: Move this to the size_request event propably?
198}
199
200sub remove {
201 my ($self) = @_;
202 # TODO FIXME: removing a child from a window will crash, see render_chld
203 $self->update;
204}
205
206sub update {
207 my ($self) = @_;
208 $self->render_chld; 267 $self->render_chld;
268 $self->SUPER::update;
209} 269}
210 270
211sub render_chld { 271sub render_chld {
212 my ($self) = @_; 272 my ($self) = @_;
213 my $chld = $self->get;
214 my ($w, $h) = $self->size_request;
215 273
216 $self->{texture} = 274 $self->{texture} =
217 Crossfire::Client::Texture->new_from_opengl ( 275 Crossfire::Client::Texture->new_from_opengl (
218 $w, $h, sub { $chld->draw } 276 $self->{w}, $self->{h}, sub { $self->child->draw }
219 ); 277 );
220 $self->{texture}->upload;
221} 278}
222 279
223sub size_request { 280sub size_allocate {
224 my ($self) = @_; 281 my ($self, $w, $h) = @_;
225 my $chld = $self->get 282
226 or return (0, 0); 283 $self->{w} = $w;
227 $chld->size_request 284 $self->{h} = $h;
285
286 $self->child->size_allocate ($w, $h);
287
288 $self->render_chld;
228} 289}
229 290
230sub _draw { 291sub _draw {
231 my ($self) = @_; 292 my ($self) = @_;
232 293
233 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 294 my ($w, $h) = ($self->w, $self->h);
234 295
235 my $tex = $self->{texture} 296 my $tex = $self->{texture}
236 or return; 297 or return;
237 298
238 glEnable GL_BLEND; 299 glEnable GL_BLEND;
239 glEnable GL_TEXTURE_2D; 300 glEnable GL_TEXTURE_2D;
240 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 301 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
241 glBindTexture GL_TEXTURE_2D, $tex->{name}; 302 glBindTexture GL_TEXTURE_2D, $tex->{name};
242
243 glColor 1, 0, 1;
244 303
245 glBegin GL_QUADS; 304 glBegin GL_QUADS;
246 glTexCoord 0, 0; glVertex 0, 0; 305 glTexCoord 0, 0; glVertex 0, 0;
247 glTexCoord 0, 1; glVertex 0, $h; 306 glTexCoord 0, 1; glVertex 0, $h;
248 glTexCoord 1, 1; glVertex $w, $h; 307 glTexCoord 1, 1; glVertex $w, $h;
251 310
252 glDisable GL_BLEND; 311 glDisable GL_BLEND;
253 glDisable GL_TEXTURE_2D; 312 glDisable GL_TEXTURE_2D;
254} 313}
255 314
315#############################################################################
316
256package Crossfire::Client::Widget::Frame; 317package Crossfire::Client::Widget::Frame;
257 318
258our @ISA = Crossfire::Client::Widget::Container::; 319our @ISA = Crossfire::Client::Widget::Bin::;
259 320
260use SDL::OpenGL; 321use SDL::OpenGL;
261 322
262sub size_request { 323sub size_request {
263 my ($self) = @_; 324 my ($self) = @_;
264 my $chld = $self->get 325 my $chld = $self->child
265 or return (0, 0); 326 or return (0, 0);
266 327
267 $chld->move (2, 2); 328 $chld->move (2, 2);
268 329
269 map { $_ + 4 } $chld->size_request; 330 map { $_ + 4 } $chld->size_request;
270} 331}
271 332
333sub size_allocate {
334 my ($self, $w, $h) = @_;
335
336 $self->{w} = $w;
337 $self->{h} = $h;
338
339 $self->child->size_allocate ($w - 4, $h - 4);
340 $self->child->move (2, 2);
341}
342
272sub _draw { 343sub _draw {
273 my ($self) = @_; 344 my ($self) = @_;
274 345
275 my $chld = $self->get; 346 my $chld = $self->child;
276 347
277 my ($w, $h) = $chld->size_request; 348 my ($w, $h) = $chld->size_request;
278 349
279 glBegin GL_QUADS; 350 glBegin GL_QUADS;
280 glColor 0, 0, 0; 351 glColor 0, 0, 0;
285 glEnd; 356 glEnd;
286 357
287 $chld->draw; 358 $chld->draw;
288} 359}
289 360
361#############################################################################
362
290package Crossfire::Client::Widget::FancyFrame; 363package Crossfire::Client::Widget::FancyFrame;
291 364
292our @ISA = Crossfire::Client::Widget::Frame::; 365our @ISA = Crossfire::Client::Widget::Bin::;
293 366
294use SDL::OpenGL; 367use SDL::OpenGL;
295 368
296sub new { 369my @tex =
297 my ($self, $theme) = @_;
298 $self = $self->SUPER::new;
299
300 $self->{txts} = [
301 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 370 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/ 371 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
303 ];
304 $self
305
306}
307 372
308sub size_request { 373sub size_request {
309 my ($self) = @_; 374 my ($self) = @_;
375
310 my ($w, $h) = $self->get->size_request; 376 my ($w, $h) = $self->SUPER::size_request;
311 377
312 $h += $self->{txts}->[1]->{height}; 378 $h += $tex[1]->{height};
313 $h += $self->{txts}->[4]->{height}; 379 $h += $tex[4]->{height};
314 $w += $self->{txts}->[2]->{width}; 380 $w += $tex[2]->{width};
315 $w += $self->{txts}->[3]->{width}; 381 $w += $tex[3]->{width};
316
317 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
318 382
319 ($w, $h) 383 ($w, $h)
320} 384}
321 385
386sub size_allocate {
387 my ($self, $w, $h) = @_;
388
389 $self->SUPER::size_allocate ($w, $h);
390
391 $h -= $tex[1]->{height};
392 $h -= $tex[4]->{height};
393 $w -= $tex[2]->{width};
394 $w -= $tex[3]->{width};
395
396 $h = $h < 0 ? 0 : $h;
397 $w = $w < 0 ? 0 : $w;
398
399 $self->child->size_allocate ($w, $h);
400 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
401}
402
322sub _draw { 403sub _draw {
323 my ($self) = @_; 404 my ($self) = @_;
324 405
325 my ($w, $h) = $self->size_request; 406 my ($w, $h) = ($self->{w}, $self->{h});
326 my ($cw, $ch) = $self->get->size_request; 407 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
327 408
328 glEnable GL_BLEND; 409 glEnable GL_BLEND;
329 glEnable GL_TEXTURE_2D; 410 glEnable GL_TEXTURE_2D;
330 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
331 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
332 413
333
334 my $top = $self->{txts}->[1]; 414 my $top = $tex[1];
335 glBindTexture GL_TEXTURE_2D, $top->{name}; 415 glBindTexture GL_TEXTURE_2D, $top->{name};
336 416
337 glColor 1, 1, 1, 0.8;
338
339 glBegin GL_QUADS; 417 glBegin GL_QUADS;
340 glTexCoord 0, 0; glVertex 0 , 0; 418 glTexCoord 0, 0; glVertex 0 , 0;
341 glTexCoord 0, 1; glVertex 0 , $top->{height}; 419 glTexCoord 0, 1; glVertex 0 , $top->{height};
342 glTexCoord 1, 1; glVertex $w , $top->{height}; 420 glTexCoord 1, 1; glVertex $w , $top->{height};
343 glTexCoord 1, 0; glVertex $w , 0; 421 glTexCoord 1, 0; glVertex $w , 0;
344 glEnd; 422 glEnd;
345 423
346 my $left = $self->{txts}->[3]; 424 my $left = $tex[3];
347 glBindTexture GL_TEXTURE_2D, $left->{name}; 425 glBindTexture GL_TEXTURE_2D, $left->{name};
348 426
349 glColor 1, 1, 1, 0.8;
350
351 glBegin GL_QUADS; 427 glBegin GL_QUADS;
352 glTexCoord 0, 0; glVertex 0 , $top->{height}; 428 glTexCoord 0, 0; glVertex 0 , $top->{height};
353 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch; 429 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
354 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch; 430 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
355 glTexCoord 1, 0; glVertex $left->{width}, $top->{height}; 431 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
356 glEnd; 432 glEnd;
357 433
358 my $right = $self->{txts}->[2]; 434 my $right = $tex[2];
359 glBindTexture GL_TEXTURE_2D, $right->{name}; 435 glBindTexture GL_TEXTURE_2D, $right->{name};
360 436
361 glColor 1, 1, 1, 0.8;
362
363 glBegin GL_QUADS; 437 glBegin GL_QUADS;
364 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height}; 438 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
365 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch; 439 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
366 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch; 440 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
367 glTexCoord 1, 0; glVertex $w , $top->{height}; 441 glTexCoord 1, 0; glVertex $w , $top->{height};
368 glEnd; 442 glEnd;
369 443
370 my $bottom = $self->{txts}->[4]; 444 my $bottom = $tex[4];
371 glBindTexture GL_TEXTURE_2D, $bottom->{name}; 445 glBindTexture GL_TEXTURE_2D, $bottom->{name};
372 446
373 glColor 1, 1, 1, 0.8;
374
375 glBegin GL_QUADS; 447 glBegin GL_QUADS;
376 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height}; 448 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
377 glTexCoord 0, 1; glVertex 0 , $h; 449 glTexCoord 0, 1; glVertex 0 , $h;
378 glTexCoord 1, 1; glVertex $w , $h; 450 glTexCoord 1, 1; glVertex $w , $h;
379 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height}; 451 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
380 glEnd; 452 glEnd;
381 453
382 my $bg = $self->{txts}->[0]; 454 my $bg = $tex[0];
383 glBindTexture GL_TEXTURE_2D, $bg->{name}; 455 glBindTexture GL_TEXTURE_2D, $bg->{name};
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
384 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT; 457 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
385 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT; 458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
386 459
387 glColor 1, 1, 1, 0.8;
388
389 my $rep_x = $cw / $bg->{width}; 460 my $rep_x = $cw / $bg->{width};
390 my $rep_y = $ch / $bg->{height}; 461 my $rep_y = $ch / $bg->{height};
391 462
392 glBegin GL_QUADS; 463 glBegin GL_QUADS;
393 glTexCoord 0, 0; glVertex $left->{width}, $top->{height}; 464 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
394 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch; 465 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
395 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch; 466 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
396 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height}; 467 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
397 glEnd; 468 glEnd;
398
399 $self->get->draw;
400 469
401 glDisable GL_BLEND; 470 glDisable GL_BLEND;
402 glDisable GL_TEXTURE_2D; 471 glDisable GL_TEXTURE_2D;
472
473 $self->child->draw;
474
403} 475}
476
477#############################################################################
404 478
405package Crossfire::Client::Widget::Table; 479package Crossfire::Client::Widget::Table;
406 480
407our @ISA = Crossfire::Client::Widget::Container::; 481our @ISA = Crossfire::Client::Widget::Bin::;
408 482
409use SDL::OpenGL; 483use SDL::OpenGL;
410 484
411sub add { 485sub add {
412 my ($self, $x, $y, $chld) = @_; 486 my ($self, $x, $y, $chld) = @_;
413 my $old_chld = $self->{childs}[$y][$x]; 487 my $old_chld = $self->{children}[$y][$x];
414 488
415 $self->{childs}[$y][$x] = $chld; 489 $self->{children}[$y][$x] = $chld;
416 $chld->set_parent ($self); 490 $chld->set_parent ($self);
417 $self->update; 491 $self->update;
418} 492}
419 493
420sub max_row_height { 494sub max_row_height {
421 my ($self, $row) = @_; 495 my ($self, $row) = @_;
422 496
423 my $hs = 0; 497 my $hs = 0;
424 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 498 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
425 my $c = $self->{childs}->[$row]->[$xi]; 499 my $c = $self->{children}->[$row]->[$xi];
426 if ($c) { 500 if ($c) {
427 my ($w, $h) = $c->size_request; 501 my ($w, $h) = $c->size_request;
428 if ($hs < $h) { $hs = $h } 502 if ($hs < $h) { $hs = $h }
429 } 503 }
430 } 504 }
433 507
434sub max_col_width { 508sub max_col_width {
435 my ($self, $col) = @_; 509 my ($self, $col) = @_;
436 510
437 my $ws = 0; 511 my $ws = 0;
438 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 512 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
439 my $c = ($self->{childs}->[$yi] || [])->[$col]; 513 my $c = ($self->{children}->[$yi] || [])->[$col];
440 if ($c) { 514 if ($c) {
441 my ($w, $h) = $c->size_request; 515 my ($w, $h) = $c->size_request;
442 if ($ws < $w) { $ws = $w } 516 if ($ws < $w) { $ws = $w }
443 } 517 }
444 } 518 }
448sub size_request { 522sub size_request {
449 my ($self) = @_; 523 my ($self) = @_;
450 524
451 my ($hs, $ws) = (0, 0); 525 my ($hs, $ws) = (0, 0);
452 526
453 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
454 $hs += $self->max_row_height ($yi); 528 $hs += $self->max_row_height ($yi);
455 } 529 }
456 530
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 531 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
458 my $wm = 0; 532 my $wm = 0;
459 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 533 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
460 $wm += $self->max_col_width ($xi) 534 $wm += $self->max_col_width ($xi)
461 } 535 }
462 if ($ws < $wm) { $ws = $wm } 536 if ($ws < $wm) { $ws = $wm }
463 } 537 }
464 538
467 541
468sub _draw { 542sub _draw {
469 my ($self) = @_; 543 my ($self) = @_;
470 544
471 my $y = 0; 545 my $y = 0;
472 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 546 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
473 my $x = 0; 547 my $x = 0;
474 548
475 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 549 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
476 550
477 my $c = $self->{childs}->[$yi]->[$xi]; 551 my $c = $self->{children}->[$yi]->[$xi];
478 if ($c) { 552 if ($c) {
479 $c->move ($x, $y, 0); #TODO: Move to size_request 553 $c->move ($x, $y, 0); #TODO: Move to size_request
480 $c->draw if $c; 554 $c->draw if $c;
481 } 555 }
482 556
485 559
486 $y += $self->max_row_height ($yi); 560 $y += $self->max_row_height ($yi);
487 } 561 }
488} 562}
489 563
564#############################################################################
565
490package Crossfire::Client::Widget::VBox; 566package Crossfire::Client::Widget::VBox;
491 567
492our @ISA = Crossfire::Client::Widget::Container::; 568our @ISA = Crossfire::Client::Widget::Container::;
493 569
494use SDL::OpenGL; 570use SDL::OpenGL;
495 571
496sub add {
497 my ($self, $chld) = @_;
498 push @{$self->{childs}}, $chld;
499 $chld->set_parent ($self);
500 $self->update;
501}
502
503sub size_request { 572sub size_request {
504 my ($self) = @_; 573 my ($self) = @_;
505 574
506 my ($hs, $ws) = (0, 0); 575 my @alloc = map [$_->size_request], @{$self->{children}};
576
577 (
578 (List::Util::max map $_->[0], @alloc),
579 (List::Util::sum map $_->[1], @alloc),
580 )
581}
582
583sub size_allocate {
584 my ($self, $w, $h) = @_;
585
586 $self->w ($w);
587 $self->h ($h);
588
589 my $exp;
590 my @oth;
591 # find expand widget
507 for (@{$self->{childs} || []}) { 592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
508 my ($w, $h) = $_->size_request; 604 my ($w, $h) = $_->size_request;
509 $hs += $h; 605 $oh += $h;
510 if ($ws < $w) { $ws = $w } 606 if ($ow < $w) { $ow = $w }
511 } 607 }
512 608
513 return ($ws, $hs); 609 my $y = 0;
514}
515
516sub _draw {
517 my ($self) = @_;
518
519 my ($x, $y);
520 for (@{$self->{childs} || []}) { 610 for (@{$self->{children}}) {
521 $_->move (0, $y, 0); #TODO: move to size_request 611 $_->move (0, $y);
522 $_->draw; 612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
523 my ($w, $h) = $_->size_request; 617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
524 $y += $h; 619 $y += $h;
620 }
525 } 621 }
526} 622}
623
624#############################################################################
527 625
528package Crossfire::Client::Widget::Label; 626package Crossfire::Client::Widget::Label;
529 627
530our @ISA = Crossfire::Client::Widget::; 628our @ISA = Crossfire::Client::Widget::;
531 629
575 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
576 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 674 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 676 glBindTexture GL_TEXTURE_2D, $tex->{name};
579 677
580 glColor 1, 1, 1, 0.6; # TODO color 678 glColor 1, 0, 0, 1; # TODO color
581 679
582 glBegin GL_QUADS; 680 glBegin GL_QUADS;
583 glTexCoord 0, 0; glVertex 0 , 0; 681 glTexCoord 0, 0; glVertex 0 , 0;
584 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 682 glTexCoord 0, 1; glVertex 0 , $tex->{height};
585 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 683 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
588 686
589 glDisable GL_BLEND; 687 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 688 glDisable GL_TEXTURE_2D;
591} 689}
592 690
691#############################################################################
692
593package Crossfire::Client::Widget::TextEntry; 693package Crossfire::Client::Widget::TextEntry;
594 694
595our @ISA = Crossfire::Client::Widget::Label::; 695our @ISA = Crossfire::Client::Widget::Label::;
596 696
597use SDL; 697use SDL;
615 $text .= chr $uni; 715 $text .= chr $uni;
616 } 716 }
617 $self->set_text ($text); 717 $self->set_text ($text);
618} 718}
619 719
620 720#############################################################################
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 721
709package Crossfire::Client::Widget::MapWidget; 722package Crossfire::Client::Widget::MapWidget;
710 723
711use strict; 724use strict;
712 725
721sub key_down { 734sub key_down {
722 print "MAPKEYDOWN\n"; 735 print "MAPKEYDOWN\n";
723} 736}
724 737
725sub key_up { 738sub key_up {
739}
740
741sub size_request {
742
743}
744
745sub size_allocate {
726} 746}
727 747
728sub _draw { 748sub _draw {
729 my ($self) = @_; 749 my ($self) = @_;
730 750
750 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 770 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
751 } 771 }
752 772
753 glEnable GL_TEXTURE_2D; 773 glEnable GL_TEXTURE_2D;
754 glEnable GL_BLEND; 774 glEnable GL_BLEND;
755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 775 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776
777 my $sw4 = ($sw + 3) & ~3;
778 my $lighting = "\x00" x ($sw4 * $sh);
756 779
757 for my $x (0 .. $sw - 1) { 780 for my $x (0 .. $sw - 1) {
758 for my $y (0 .. $sh - 1) { 781 for my $y (0 .. $sh - 1) {
759 782
760 my $cell = $map->[$x + $xofs][$y + $yofs] 783 my $cell = $map->[$x + $xofs][$y + $yofs]
761 or next; 784 or next;
762 785
763 my $darkness = $cell->[0] * (1 / 255); 786 my $darkness = $cell->[0] * (1 / 255);
764 if ($darkness < 0) { 787 if ($darkness < 0) {
765 glColor 0.3, 0.3, 0.3; 788 $darkness = 0.15;
766 } else {
767 glColor $darkness, $darkness, $darkness;
768 } 789 }
790 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
769 791
770 for my $num (grep $_, @$cell[1,2,3]) { 792 for my $num (grep $_, @$cell[1,2,3]) {
771 my $tex = $::CONN->{face}[$num]{texture} || next; 793 my $tex = $::CONN->{face}[$num]{texture} || next;
772 794
773 glBindTexture GL_TEXTURE_2D, $tex->{name}; 795 glBindTexture GL_TEXTURE_2D, $tex->{name};
785 glTexCoord 1, 0; glVertex $px + $w, $py; 807 glTexCoord 1, 0; glVertex $px + $w, $py;
786 glEnd; 808 glEnd;
787 } 809 }
788 } 810 }
789 } 811 }
812
813# if (1) { # higher quality darkness
814# $lighting =~ s/(.)/$1$1$1/gs;
815# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
816#
817# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
818#
819# $lighting = $pb->get_pixels;
820# $lighting =~ s/(.)../$1/gs;
821# }
822
823 $lighting = new Crossfire::Client::Texture
824 width => $sw4,
825 height => $sh,
826 data => $lighting,
827 internalformat => GL_ALPHA4,
828 format => GL_ALPHA;
829
830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
831 glColor 0, 0, 0, 0.75;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
833 glBindTexture GL_TEXTURE_2D, $lighting->{name};
834 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
835 glBegin GL_QUADS;
836 glTexCoord 0, 0; glVertex 0 , 0;
837 glTexCoord 0, 1; glVertex 0 , $sh * 32;
838 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
839 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
840 glEnd;
790 841
791 glDisable GL_TEXTURE_2D; 842 glDisable GL_TEXTURE_2D;
792 glDisable GL_BLEND; 843 glDisable GL_BLEND;
793} 844}
794 845
841 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 892 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
842 $::CONN->send ("command run_stop"); 893 $::CONN->send ("command run_stop");
843 } 894 }
844} 895}
845 896
897#############################################################################
898
899package Crossfire::Client::Widget::Animator;
900
901use SDL::OpenGL;
902
903our @ISA = Crossfire::Client::Widget::Bin::;
904
905sub moveto {
906 my ($self, $x, $y) = @_;
907
908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909 $self->{speed} = 0.2;
910 $self->{time} = 1;
911
912 ::animation_start $self;
913}
914
915sub animate {
916 my ($self, $interval) = @_;
917
918 $self->{time} -= $interval * $self->{speed};
919 if ($self->{time} <= 0) {
920 $self->{time} = 0;
921 ::animation_stop $self;
922 }
923
924 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
925
926 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
927 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
928}
929
930sub _draw {
931 my ($self) = @_;
932
933 glPushMatrix;
934 glRotate $self->{time} * 10000, 0, 1, 0;
935 $self->{children}[0]->draw;
936 glPopMatrix;
937}
938
8461; 9391;
847 940

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines