15,16c15,20
< #include "speaker.bitmap"
< #include "request.bitmap"
---
> #include "speaking.bitmap"
> #include "requesting.bitmap"
> /*
> #include "sittingchair.bitmap"
> #include "speakingchair.bitmap"
> */
17a22,24
> #include "supersit.bitmap"
> #include "superspeak.bitmap"
> 
39c46
<       offset(person.pose), XtRImmediate, (caddr_t) PERSON_SITTING},
---
>       offset(person.pose), XtRImmediate, (caddr_t) POSE_SITTING},
102,104c109,113
< 	NULL,				/* sitting pixmap */
< 	NULL,				/* standing pixmap */
< 	NULL,				/* request pixmap */
---
> 	NULL,				/* sitting pixmap		*/
> 	NULL,				/* standing pixmap		*/
> 	NULL,				/* request pixmap		*/
> 	NULL,				/* sitting chairman pixmap	*/
> 	NULL,				/* standing chairman pixmap	*/
128,131d136
< 
< /*
< 	tw->person.state = PERSON_SITTING;
< */
231c236
< 		class->person_class.request_pixmap =
---
> 		class->person_class.requesting_pixmap =
235,237c240,242
<                         	request_bits,
<                         	request_width,
<                         	request_height);
---
>                         	requesting_bits,
>                         	requesting_width,
>                         	requesting_height);
239c244
< 		class->person_class.speaker_pixmap =
---
> 		class->person_class.speaking_pixmap =
243,245c248,250
<                         	speaker_bits,
<                         	speaker_width,
<                         	speaker_height);
---
>                         	speaking_bits,
>                         	speaking_width,
>                         	speaking_height);
246a252,267
> 		class->person_class.speakingchair_pixmap =
>  			XCreateBitmapFromData (
>                         	XtDisplay(w),
>                         	XtWindow(w),
>                         	speakingchair_bits,
>                         	speakingchair_width,
>                         	speakingchair_height);
> 
> 		class->person_class.sittingchair_pixmap =
>  			XCreateBitmapFromData (
>                         	XtDisplay(w),
>                         	XtWindow(w),
>                         	sittingchair_bits,
>                         	sittingchair_width,
>                         	sittingchair_height);
> 
253c274
< 	case PERSON_SITTING:
---
> 	case POSE_SITTING:
262c283
< 	case PERSON_REQUEST:
---
> 	case POSE_REQUESTING:
264c285
< 				class->person_class.request_pixmap,
---
> 				class->person_class.requesting_pixmap,
266c287
< 				0, 0, request_width, request_height,
---
> 				0, 0, requesting_width, requesting_height,
271c292
< 	case PERSON_SPEAKER:
---
> 	case POSE_SPEAKING:
273c294
< 				class->person_class.speaker_pixmap,
---
> 				class->person_class.speaking_pixmap,
275c296,314
< 				0, 0, speaker_width, speaker_height,
---
> 				0, 0, speaking_width, speaking_height,
> 				(int) hoffset,
> 				(int) voffset,
> 				(unsigned long) 1L);
> 		break;
> 	case POSE_SPEAKINGCHAIR:
> 		XCopyPlane (	XtDisplay(w), 
> 				class->person_class.speakingchair_pixmap,
> 				XtWindow(w), gc,
> 				0, 0, speakingchair_width, speakingchair_height,
> 				(int) hoffset,
> 				(int) voffset,
> 				(unsigned long) 1L);
> 		break;
> 	case POSE_SITTINGCHAIR:
> 		XCopyPlane (	XtDisplay(w), 
> 				class->person_class.sittingchair_pixmap,
> 				XtWindow(w), gc,
> 				0, 0, sitting_width, sittingchair_height,