Merge pull request #594 from Tux/master
Allow the special colors 32..41 in %Cfg,bg
This commit is contained in:
		
						commit
						096d0660e2
					
				
					 2 changed files with 4 additions and 0 deletions
				
			
		| 
						 | 
					@ -3200,6 +3200,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent,
 | 
				
			||||||
					if (col_num == 99)	/* mIRC lameness */
 | 
										if (col_num == 99)	/* mIRC lameness */
 | 
				
			||||||
						col_num = XTEXT_FG;
 | 
											col_num = XTEXT_FG;
 | 
				
			||||||
					else
 | 
										else
 | 
				
			||||||
 | 
										if (col_num > XTEXT_MAX_COLOR)
 | 
				
			||||||
						col_num = col_num % XTEXT_MIRC_COLS;
 | 
											col_num = col_num % XTEXT_MIRC_COLS;
 | 
				
			||||||
					xtext->col_fore = col_num;
 | 
										xtext->col_fore = col_num;
 | 
				
			||||||
					if (!mark)
 | 
										if (!mark)
 | 
				
			||||||
| 
						 | 
					@ -3226,6 +3227,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent,
 | 
				
			||||||
						if (col_num == 99)	/* mIRC lameness */
 | 
											if (col_num == 99)	/* mIRC lameness */
 | 
				
			||||||
							col_num = XTEXT_BG;
 | 
												col_num = XTEXT_BG;
 | 
				
			||||||
						else
 | 
											else
 | 
				
			||||||
 | 
											if (col_num > XTEXT_MAX_COLOR)
 | 
				
			||||||
							col_num = col_num % XTEXT_MIRC_COLS;
 | 
												col_num = col_num % XTEXT_MIRC_COLS;
 | 
				
			||||||
						if (col_num == XTEXT_BG)
 | 
											if (col_num == XTEXT_BG)
 | 
				
			||||||
							xtext->backcolor = FALSE;
 | 
												xtext->backcolor = FALSE;
 | 
				
			||||||
| 
						 | 
					@ -3239,6 +3241,7 @@ gtk_xtext_render_str (GtkXText * xtext, int y, textentry * ent,
 | 
				
			||||||
						if (col_num == 99)	/* mIRC lameness */
 | 
											if (col_num == 99)	/* mIRC lameness */
 | 
				
			||||||
							col_num = XTEXT_FG;
 | 
												col_num = XTEXT_FG;
 | 
				
			||||||
						else
 | 
											else
 | 
				
			||||||
 | 
											if (col_num > XTEXT_MAX_COLOR)
 | 
				
			||||||
							col_num = col_num % XTEXT_MIRC_COLS;
 | 
												col_num = col_num % XTEXT_MIRC_COLS;
 | 
				
			||||||
						if (!mark)
 | 
											if (!mark)
 | 
				
			||||||
							xtext_set_fg (xtext, gc, col_num);
 | 
												xtext_set_fg (xtext, gc, col_num);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -58,6 +58,7 @@
 | 
				
			||||||
#define XTEXT_FG 34
 | 
					#define XTEXT_FG 34
 | 
				
			||||||
#define XTEXT_BG 35
 | 
					#define XTEXT_BG 35
 | 
				
			||||||
#define XTEXT_MARKER 36		/* for marker line */
 | 
					#define XTEXT_MARKER 36		/* for marker line */
 | 
				
			||||||
 | 
					#define XTEXT_MAX_COLOR 41
 | 
				
			||||||
 | 
					
 | 
				
			||||||
typedef struct _GtkXText GtkXText;
 | 
					typedef struct _GtkXText GtkXText;
 | 
				
			||||||
typedef struct _GtkXTextClass GtkXTextClass;
 | 
					typedef struct _GtkXTextClass GtkXTextClass;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue